From 51033d9b3146267341f94d8a4c190623283898c6 Mon Sep 17 00:00:00 2001
From: Joseph M <josephm@inmotionhosting.com>
Date: Mon, 26 Aug 2019 17:37:48 -0400
Subject: [PATCH] [octavia] Add region-specific catalog lookups

octavia.conf is missing configuration values required to do service
catalog lookups in multiple region environments. Without them Octavia
can try to contact a service in a different region than its own. Specify
region_name and endpoint_type for the glance, neutron, and nova services
to prevent this from happening.

Change-Id: I753cf443c1506bbd7b69fc47e2e0a9b39857509c
Closes-Bug: #1841479
---
 ansible/roles/octavia/templates/octavia.conf.j2 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2
index 09d828c91f..b32a5fa159 100644
--- a/ansible/roles/octavia/templates/octavia.conf.j2
+++ b/ansible/roles/octavia/templates/octavia.conf.j2
@@ -79,3 +79,15 @@ transport_url = {{ notify_transport_url }}
 [oslo_policy]
 policy_file = {{ octavia_policy_file }}
 {% endif %}
+
+[glance]
+region_name = {{ openstack_region_name }}
+endpoint_type = internal
+
+[neutron]
+region_name = {{ openstack_region_name }}
+endpoint_type = internal
+
+[nova]
+region_name = {{ openstack_region_name }}
+endpoint_type = internal