From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Sun, 31 May 2015 20:26:35 +0000 (+0200)
Subject: Neutron: Remove hiera lookup to controller_host
X-Git-Tag: opnfv-6.0.0~2523^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3531fdb617e7efda9fda295a3c067452eb09aea4;p=apex-tripleo-heat-templates.git

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
---

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'),
   }