Merge "Neutron: nova_metadata_ip property is deprecated"

This commit is contained in:
Jenkins
2017-07-05 01:05:08 +00:00
committed by Gerrit Code Review

View File

@@ -1,6 +1,6 @@
# metadata_agent.ini # metadata_agent.ini
[DEFAULT] [DEFAULT]
nova_metadata_ip = {% if orchestration_engine == 'KUBERNETES' %}nova-metadata{% else %}{{ kolla_internal_fqdn }}{% endif %} nova_metadata_host = {% if orchestration_engine == 'KUBERNETES' %}nova-metadata{% else %}{{ kolla_internal_fqdn }}{% endif %}
nova_metadata_port = {{ nova_metadata_port }} nova_metadata_port = {{ nova_metadata_port }}
metadata_proxy_shared_secret = {{ metadata_secret }} metadata_proxy_shared_secret = {{ metadata_secret }}