From ea5a7dd30003ccdfb4d096f8e7101b550df834d1 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Fri, 17 Aug 2018 16:31:11 +0100
Subject: [PATCH] Explicitly specify endpoint type during Monasca registration

Monasca defaults to using the public endpoint to register
Monasca endpoints which is bad practice and doesn't work on
some deployments. This change uses the admin interface by
default.

Change-Id: Ia9c5e041e71867fe72aad43e1344cd2107652d7d
Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Closes-Bug: #1787610
---
 ansible/roles/monasca/tasks/register.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/monasca/tasks/register.yml b/ansible/roles/monasca/tasks/register.yml
index b2f5b74c85..b4abf6806e 100644
--- a/ansible/roles/monasca/tasks/register.yml
+++ b/ansible/roles/monasca/tasks/register.yml
@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ monasca_openstack_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ monasca_api_admin_endpoint }}'}
@@ -29,6 +30,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ monasca_openstack_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ monasca_log_api_admin_endpoint }}'}
@@ -45,6 +47,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ monasca_openstack_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
   run_once: True
 
 - name: Creating monasca roles
@@ -54,6 +57,7 @@
       name: "{{ item }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ monasca_openstack_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
   run_once: True
   with_items:
     - "{{ monasca_default_authorized_roles }}"