From 97cb48bc852b3ba45e677eb7c06e6673aa5fc160 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Tue, 30 Jul 2019 15:36:31 +0300
Subject: [PATCH] service_setup: region override

During original patch ability to override region was missing. This patch
return functionality of defining region during keystone service creation

It also updates a bit service_setup with ability to provide domain.

Change-Id: I7b0cd5b5552777bbdb6037edb635d8edaad5fc5b
---
 tasks/main.yml          |  1 +
 tasks/service_setup.yml | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 5c6f62f5..89037795 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -148,6 +148,7 @@
     _service_project_name: "{{ cinder_service_project_name }}"
     _service_endpoints: "{{ cinder_service_endpoints }}"
     _service_catalog: "{{ cinder_service_catalog }}"
+    _service_region: "{{ cinder_service_region }}"
     _service_users:
       - name: "{{ cinder_service_user_name }}"
         password: "{{ cinder_service_password }}"
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
index d43d14e9..0ff5465f 100644
--- a/tasks/service_setup.yml
+++ b/tasks/service_setup.yml
@@ -31,13 +31,26 @@
   vars:
     ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
   block:
+    - name: Add keystone domain
+      os_keystone_domain:
+        cloud: default
+        state: present
+        name: "{{ _domain_name }}"
+        endpoint_type: admin
+        verify: "{{ not _service_adminuri_insecure }}"
+      register: add_domain
+      when: _domain_name is defined
+      until: add_domain is success
+      retries: 5
+      delay: 10
+
     - name: Add service project
       os_project:
         cloud: default
         state: present
         name: "{{ _project_name }}"
-        description: "{{ _project_description | default('') }}"
-        domain_id: "default"
+        description: "{{ _project_description | default(omit) }}"
+        domain_id: "{{ _project_domain | default('default') }}"
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
       register: add_service
@@ -88,10 +101,11 @@
         state: present
         name: "{{ item.name }}"
         password: "{{ item.password }}"
-        domain: default
+        domain: "{{ item.domain | default('default') }}"
         default_project: "{{ item.project | default(_service_project_name) }}"
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
+        update_password: always
       register: add_service
       when:
         - not (_service_in_ldap | default(False) | bool)
@@ -112,6 +126,7 @@
         user: "{{ item.name }}"
         role: "{{ item.role }}"
         project: "{{ item.project | default(_service_project_name) }}"
+        domain: "{{ item.domain | default(omit) }}"
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
       register: add_service