summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-21 16:00:39 +0000
committerGerrit Code Review <review@openstack.org>2016-09-21 16:00:39 +0000
commit5c2871e2f30e3664c1605345892fa11f280ed7d2 (patch)
treec0494e5567e5f94d1b99c1d19e28dab39ffac67c
parent1e723337029b8ea77f12dd2d75a4a426570f1c63 (diff)
parent0fcd1a72d7d10d7d3244fced9409d0c10b2ee664 (diff)
Merge "Set Neutron's metadata_ip to the nova metadata VIP"
-rw-r--r--puppet/services/neutron-metadata.yaml7
1 files changed, 1 insertions, 6 deletions
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