From a3cbacc91784c9dfc7126955da24b8d7ba4cfc7e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 25 Sep 2025 11:00:48 +0200
Subject: [PATCH] Use unique register variables for service_setup

In case details of created/managed users are
needed somewhere in the context of the role or
playbook including service_setup, it is not possible
at the moment due to intertwining names
between different tasks.

At the same time, there are usecases, where operator
have to explicitly set project/user UUIDs
later on.

Change-Id: I52a62c85d214639b1411a6559a01056b1c94fb29
Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
---
 roles/service_setup/tasks/main.yml        | 12 ++++++------
 roles/service_setup/tasks/setup_roles.yml |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/service_setup/tasks/main.yml b/roles/service_setup/tasks/main.yml
index 8ea819ee..cd3a3365 100644
--- a/roles/service_setup/tasks/main.yml
+++ b/roles/service_setup/tasks/main.yml
@@ -42,11 +42,11 @@
         domain_id: "{{ _project_domain | default('default') }}"
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
-      register: add_service
+      register: add_project
       when:
         - not (_service_in_ldap | default(False) | bool)
         - _project_name is defined
-      until: add_service is success
+      until: add_project is success
       retries: 5
       delay: 10
 
@@ -79,14 +79,14 @@
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
         update_password: "{{ (service_update_password | default(False) | bool) | ternary('always', omit) }}"
-      register: add_service
+      register: add_user
       when:
         - not (_service_in_ldap | default(False) | bool)
         - _service_users is defined
         - "'name' in item"
         - "'password' in item"
         - (item.condition | default(True)) | bool
-      until: add_service is success
+      until: add_user is success
       with_items: "{{ _service_users }}"
       retries: 5
       delay: 10
@@ -116,8 +116,8 @@
         region: "{{ _service_region | default('RegionOne') }}"
         endpoint_type: admin
         validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
-      register: add_service
-      until: add_service is success
+      register: add_endpoint
+      until: add_endpoint is success
       retries: 5
       delay: 10
       with_items: "{{ _service_endpoints }}"
diff --git a/roles/service_setup/tasks/setup_roles.yml b/roles/service_setup/tasks/setup_roles.yml
index acf5742c..ee63d130 100644
--- a/roles/service_setup/tasks/setup_roles.yml
+++ b/roles/service_setup/tasks/setup_roles.yml
@@ -22,8 +22,8 @@
     name: "{{ role_mapping['name'] }}"
     endpoint_type: admin
     validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
-  register: add_service
-  until: add_service is success
+  register: add_role
+  until: add_role is success
   retries: 5
   delay: 10
   no_log: "{{ _service_setup_nolog | default(True) }}"
@@ -46,8 +46,8 @@
     domain: "{{ user.domain | default('default') }}"
     endpoint_type: admin
     validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
-  register: add_service
-  until: add_service is success
+  register: add_role_assignment
+  until: add_role_assignment is success
   retries: 5
   delay: 10
   no_log: "{{ _service_setup_nolog | default(True) }}"