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 1e888f3..dd5df1e 100644 (file)
--- 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 cf20c0c..8863f42 100644 (file)
--- 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