From eb24945d75379952d0988403f3ed4bb9203f2113 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Wed, 24 Jun 2020 16:24:30 +0100
Subject: [PATCH] Use internalURL endpoint_type for all clients used by Magnum
Magnum, Cinder and Octavia clients in Magnum now use endpoint_type of
internalURL by default consistent with other clients also used by the
conductor. Additionally, they also use the globally defined
`openstack_region_name` for region_name.
Closes-Bug: #1885096
Change-Id: Ibec511013760cc4f681a2ec1b769b532be3daf2d
---
ansible/roles/magnum/templates/magnum.conf.j2 | 9 +++++++++
...ients-in-magnum-use-internalURL-af3ad82af71a88c6.yaml | 7 +++++++
2 files changed, 16 insertions(+)
create mode 100644 releasenotes/notes/clients-in-magnum-use-internalURL-af3ad82af71a88c6.yaml
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index 7e143d7ed8..d9a3be3620 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -23,12 +23,21 @@ max_retries = -1
default_docker_volume_type = {{ default_docker_volume_type }}
{% endif %}
+[magnum_client]
+region_name = {{ openstack_region_name }}
+endpoint_type = internalURL
+
[heat_client]
region_name = {{ openstack_region_name }}
endpoint_type = internalURL
+[octavia_client]
+region_name = {{ openstack_region_name }}
+endpoint_type = internalURL
+
[cinder_client]
region_name = {{ openstack_region_name }}
+endpoint_type = internalURL
[barbican_client]
region_name = {{ openstack_region_name }}
diff --git a/releasenotes/notes/clients-in-magnum-use-internalURL-af3ad82af71a88c6.yaml b/releasenotes/notes/clients-in-magnum-use-internalURL-af3ad82af71a88c6.yaml
new file mode 100644
index 0000000000..0cfbd32ecf
--- /dev/null
+++ b/releasenotes/notes/clients-in-magnum-use-internalURL-af3ad82af71a88c6.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ In line with clients for other services used by Magnum, it now uses
+ endpoint_type = internalURL also for Magnum itself, Cinder and Octavia
+ clients. In the same tune, these services also use the globally defined
+ `openstack_region_name`.