aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJoseph M <josephm@inmotionhosting.com>2019-08-30 13:14:59 -0400
committerJoseph M <josephm@inmotionhosting.com>2019-08-30 13:14:59 -0400
commit096555dcf2db9986572ebee85efc395e5f59fbe8 (patch)
tree3f23e044faba698defe83b9c0512ccc7d4b7fdc5 /ansible
parentc3665aa3279f08f6e0fbb56761b751555d4e8727 (diff)
downloadkolla-ansible-096555dcf2db9986572ebee85efc395e5f59fbe8.tar.gz
kolla-ansible-096555dcf2db9986572ebee85efc395e5f59fbe8.zip
[nova] Fix service catalog lookup of Neutron endpoint
nova.conf currently uses the [neutron] "url" parameter which has been deprecated since 17.0.0. In multi-region environments this can cause Nova to look up the Neutron endpoint for a different region. Remove this parameter and set region_name and valid_interfaces to allow the correct lookup to be performed. Change-Id: I1bbc73728439a460447bc8edd264f9f2d3c814e0 Closes-Bug: #1836952
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/nova/templates/nova.conf.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 47770893c..ca4092653 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -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]