From 4c8dd7f0f3bc9423e11bcef325a0e1e5ff3e5c63 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Tue, 20 Aug 2019 03:05:56 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Iaee4b8e18c8f2173e3d4c7ef9d7d1f4e65d59985
---
 .gitignore              | 28 +++++++++++-----------------
 tasks/service_setup.yml | 21 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce47fe6f..3a772066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,14 @@
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
 # Compiled source #
 ###################
 *.com
@@ -33,25 +44,11 @@ logs/*
 
 # OS generated files #
 ######################
-.DS_Store
-.DS_Store?
 ._*
-.Spotlight-V100
-.Trashes
-.idea
 .tox
-*.sublime*
 *.egg-info
-Icon?
-ehthumbs.db
-Thumbs.db
 .eggs
 
-# User driven backup files #
-############################
-*.bak
-*.swp
-
 # Generated by pbr while building docs
 ######################################
 AUTHORS
@@ -70,6 +67,3 @@ tests/*.retry
 # Git clones
 openstack-ansible-ops
 previous
-
-# Editor files
-.vscode
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