From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Tue, 31 May 2016 11:25:17 +0000 (+0300)
Subject: Take 'host' parameter from neutron manifest into use
X-Git-Tag: opnfv-6.0.0~1965^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=70ded53219b62a4cdd78588c3073562889ab2ca8;p=apex-tripleo-heat-templates.git

Take 'host' parameter from neutron manifest into use

Recently the 'host' parameter was added to the neutron manifest. So we
no longer need to manually add it to the configuration.

Change-Id: I6cb73c6d5da8b99680dec97e03ac4805451835fb
Depends-On: I81b86208826e99beccafd2871ce2afd45394e37f
---

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 1e888f39..dd5df1e2 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -22,4 +22,6 @@ nova::compute::reserved_host_memory: 2048
 ceilometer::agent::auth::auth_tenant_name: 'service'
 ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 
+neutron::host: "%{::fqdn}"
+
 compute_classes: []
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cf20c0ca..8863f423 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -198,10 +198,6 @@ if hiera('step') >= 4 {
     }
   }
 
-  neutron_config {
-    'DEFAULT/host': value => $fqdn;
-  }
-
   include ::ceilometer
   include ::ceilometer::config
   include ::ceilometer::agent::compute