summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-01 07:57:05 +0000
committerGerrit Code Review <review@openstack.org>2015-06-01 07:57:05 +0000
commitd75067951fbd32e0144550bffcd62ab48e2712ee (patch)
tree90d6fee680349ad23f1df687908482fff082226b /puppet/manifests
parent0c63d2be82a5c5ef138071f6f6a3f7204e30d403 (diff)
parent3531fdb617e7efda9fda295a3c067452eb09aea4 (diff)
Merge "Neutron: Remove hiera lookup to controller_host"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 655a2dfe..ba25162a 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -494,7 +494,6 @@ if hiera('step') >= 3 {
enabled => false,
bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
tunnel_types => split(hiera('neutron_tunnel_types'), ','),
- local_ip => hiera('controller_host'),
}