summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-31 14:25:17 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-06-01 11:41:59 +0300
commit70ded53219b62a4cdd78588c3073562889ab2ca8 (patch)
tree0582c90dfe3ae727fab7a0cc0c06a4119d5c9d52
parentccb46a51ac8ca59865c04b681628edbc5a167530 (diff)
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
-rw-r--r--puppet/hieradata/compute.yaml2
-rw-r--r--puppet/manifests/overcloud_compute.pp4
2 files changed, 2 insertions, 4 deletions
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