Neutron: Remove hiera lookup to controller_host
authorYanis Guenane <yanis.guenane@enovance.com>
Sun, 31 May 2015 20:26:35 +0000 (22:26 +0200)
committerYanis Guenane <yanis.guenane@enovance.com>
Sun, 31 May 2015 20:28:24 +0000 (22:28 +0200)
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

puppet/manifests/overcloud_controller_pacemaker.pp

index d3b5f85..240a669 100644 (file)
@@ -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'),
   }