Merge "[nova] Fix service catalog lookup of Neutron endpoint"

This commit is contained in:
Zuul 2019-09-04 09:18:37 +00:00 committed by Gerrit Code Review
commit 8661599b9e

View File

@ -133,7 +133,6 @@ os_region_name = {{ openstack_region_name }}
{% endif %}
[neutron]
url = {{ internal_protocol }}://{{ neutron_internal_fqdn }}:{{ neutron_server_port }}
metadata_proxy_shared_secret = {{ metadata_secret }}
service_metadata_proxy = true
{% if neutron_plugin_agent == 'vmware_nsxv3' %}
@ -146,6 +145,8 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service
username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }}
region_name = {{ openstack_region_name }}
valid_interfaces = internal
{% if not service_name.startswith('nova-compute') %}
[database]