From: Dan Prince <dprince@redhat.com>
Date: Sun, 1 Feb 2015 02:39:09 +0000 (-0500)
Subject: Puppet: correct neutron metadata agents nova ip
X-Git-Tag: opnfv-6.0.0~2675
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8ca552d33b0da248ee37452833888424d01e3c56;p=apex-tripleo-heat-templates.git

Puppet: correct neutron metadata agents nova ip

This updates the controller config for the Neutron metadata
agent so that it configures the correct nova_metadata_ip
in /etc/neutron/metadata_agent.ini.

Change-Id: I4d6658ba54e582673938fa14a8c7de287dcd6662
Closes-bug: #1416781
---

diff --git a/controller-puppet.yaml b/controller-puppet.yaml
index 03621053..747c38af 100644
--- a/controller-puppet.yaml
+++ b/controller-puppet.yaml
@@ -653,6 +653,7 @@ resources:
                 neutron::agents::ml2::ovs::local_ip: {get_input: controller_host}
                 neutron_flat_networks: {get_input: neutron_flat_networks}
                 neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
+                neutron::agents::metadata::metadata_ip: {get_input: controller_virtual_ip}
                 neutron_agent_mode: {get_input: neutron_agent_mode}
                 neutron_router_distributed: {get_input: neutron_router_distributed}
                 neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}