summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-02 07:14:04 +0000
committerGerrit Code Review <review@openstack.org>2016-06-02 07:14:04 +0000
commit006daae9253b6545fab708c204c30325318554f2 (patch)
treee91c082a3cea8b26921db8d4e91b538ed9d9f801 /puppet/manifests
parent7872505beb3a0961258d1fbdb8e08a5840ec0a8c (diff)
parent70ded53219b62a4cdd78588c3073562889ab2ca8 (diff)
Merge "Take 'host' parameter from neutron manifest into use"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_compute.pp4
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index f766c36e..2f45c787 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -197,10 +197,6 @@ if hiera('step') >= 4 {
}
}
- neutron_config {
- 'DEFAULT/host': value => $fqdn;
- }
-
include ::ceilometer
include ::ceilometer::config
include ::ceilometer::agent::compute