summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYanis Guenane <yanis.guenane@enovance.com>2015-05-31 22:26:35 +0200
committerYanis Guenane <yanis.guenane@enovance.com>2015-05-31 22:28:24 +0200
commit3531fdb617e7efda9fda295a3c067452eb09aea4 (patch)
tree1d5b9de646e9b18c4bfffb01b34caf52896d24c3
parent5b5446f5b50a80e96edd2a1347cb502949e276a6 (diff)
Neutron: Remove hiera lookup to controller_host
With current effort of creating isolated networks, the controller_host hiera variable does not exist anymore. Hence we remove it else the lookup will fail. The hiera binding neutron::agents::ml2::ovs::local_ip has been written in another review[1] [1] I1dc11987b4ea3c37775b14fbdddb75588499e9bb Change-Id: I12777c512d379210e5cddb5e683be4d79808fa2c
-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 d3b5f857..240a6692 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -493,7 +493,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'),
}