From: Brent Eagles <beagles@redhat.com>
Date: Tue, 20 Sep 2016 20:51:40 +0000 (-0230)
Subject: Set Neutron's metadata_ip to the nova metadata VIP
X-Git-Tag: opnfv-6.0.0~1582^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0fcd1a72d7d10d7d3244fced9409d0c10b2ee664;p=apex-tripleo-heat-templates.git

Set Neutron's metadata_ip to the nova metadata VIP

The neutron metadata agent's metadata_ip field is meant to refer to the
nova metadata service, not the local address on the NeutronApiNetwork.

Change-Id: Ibb25a80ea3e66ab3f5cf63c197460d495939778d
Closes-Bug: #1625504
---

diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml
index 0479231f..a124d4a1 100644
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@@ -65,11 +65,6 @@ outputs:
             neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
             neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
             neutron::agents::metadata::auth_tenant: 'service'
-            # NOTE: bind IP is found in Heat replacing the network name with the local node IP
-            # for the given network; replacement examples (eg. for internal_api):
-            # internal_api -> IP
-            # internal_api_uri -> [IP]
-            # internal_api_subnet - > IP/CIDR
-            neutron::agents::metadata::metadata_ip: {get_param: [ServiceNetMap, NeutronApiNetwork]}
+            neutron::agents::metadata::metadata_ip: '"%{hiera(\"nova_metadata_vip\")}"'
       step_config: |
         include tripleo::profile::base::neutron::metadata