From d13e2ebf77772f86b04447bc643636b25b863095 Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Sat, 25 Feb 2017 20:03:51 -0600
Subject: [PATCH] Bypass LB for service setup

The keystone container can communicate with itself directly for
service setup in case the load balancer is in maintenance mode
while the service is being deployed.

Closes-Bug: #1680075
Depends-On: I6ecfc422b0e8a7a5fadea08389c1268009ac7f2a
Change-Id: I379b68682a240d729765da74b3a9ec55df0920ee
---
 tasks/keystone_service_setup.yml | 19 ++++++++++++-------
 tasks/main.yml                   |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tasks/keystone_service_setup.yml b/tasks/keystone_service_setup.yml
index ada1d072..d57df7c3 100644
--- a/tasks/keystone_service_setup.yml
+++ b/tasks/keystone_service_setup.yml
@@ -20,9 +20,9 @@
     method: "HEAD"
     status_code: 300
   with_items:
-    - url: "{{ keystone_service_adminuri }}"
+    - url: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}"
       validate_certs: "{{ not keystone_service_adminuri_insecure | bool }}"
-    - url: "{{ keystone_service_internaluri }}"
+    - url: "{{ keystone_service_internaluri_proto }}://{{ ansible_host }}:{{ keystone_service_port }}"
       validate_certs: "{{ not keystone_service_internaluri_insecure | bool }}"
   register: _wait_check
   until: _wait_check | success
@@ -56,7 +56,8 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
+    endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
+    ignore_catalog: True
     tenant_name: "{{ keystone_service_tenant_name }}"
     description: "{{ keystone_service_description }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
@@ -72,7 +73,8 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
+    endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
+    ignore_catalog: True
     role_name: "{{ keystone_default_role_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_member_role
@@ -88,7 +90,8 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
+    endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
+    ignore_catalog: True
     service_name: "{{ keystone_service_name }}"
     service_type: "{{ keystone_service_type }}"
     description: "{{ keystone_service_description }}"
@@ -105,7 +108,8 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
+    endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
+    ignore_catalog: True
     user_name: "{{ keystone_service_user_name }}"
     tenant_name: "{{ keystone_service_tenant_name }}"
     password: "{{ keystone_service_password }}"
@@ -122,7 +126,8 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
+    endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
+    ignore_catalog: True
     user_name: "{{ keystone_service_user_name }}"
     tenant_name: "{{ keystone_service_tenant_name }}"
     role_name: "{{ keystone_role_name }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 917da51d..1f331f64 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -130,7 +130,7 @@
 - include: keystone_service_setup.yml
   when:
     - keystone_service_setup | bool
-    - inventory_hostname == groups['keystone_all'][0]
+    - inventory_hostname == ansible_play_hosts[0]
   tags:
     - keystone-config