From 096555dcf2db9986572ebee85efc395e5f59fbe8 Mon Sep 17 00:00:00 2001
From: Joseph M <josephm@inmotionhosting.com>
Date: Fri, 30 Aug 2019 13:14:59 -0400
Subject: [PATCH] [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
---
 ansible/roles/nova/templates/nova.conf.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 47770893c1..ca40926539 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]