From f51e4bca37b61184ab7a554b02435dacb1258293 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 25 Sep 2025 11:10:17 +0200
Subject: [PATCH] Run service_setup before post_install

There are usecases, where configuration files might require
details of created users/projects, which are provisioned
during service_setup include. Image volume cache [1]
is one example, where UUIDs must be supplied explicitly.

[1] https://docs.openstack.org/cinder/latest/admin/image-volume-cache.html#configure-the-internal-tenant

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/962252
Change-Id: I2773d095277d76c254e996c99bf1debed9607c61
Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
---
 tasks/main.yml | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index dd772a75..5db92107 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -141,6 +141,31 @@
   tags:
     - cinder-config
 
+- name: Including osa.service_setup role
+  ansible.builtin.include_role:
+    name: openstack.osa.service_setup
+    apply:
+      tags:
+        - common-service
+        - cinder-config
+  vars:
+    _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
+    _service_in_ldap: "{{ cinder_service_in_ldap }}"
+    _service_setup_host: "{{ cinder_service_setup_host }}"
+    _service_setup_host_python_interpreter: "{{ cinder_service_setup_host_python_interpreter }}"
+    _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 }}"
+        role: "{{ cinder_service_role_names }}"
+  when:
+    - _cinder_is_first_play_host
+  tags:
+    - always
+
 - name: Importing cinder_post_install tasks
   ansible.builtin.import_tasks: cinder_post_install.yml
   tags:
@@ -193,31 +218,6 @@
     - cinder-config
     - uwsgi
 
-- name: Including osa.service_setup role
-  ansible.builtin.include_role:
-    name: openstack.osa.service_setup
-    apply:
-      tags:
-        - common-service
-        - cinder-config
-  vars:
-    _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
-    _service_in_ldap: "{{ cinder_service_in_ldap }}"
-    _service_setup_host: "{{ cinder_service_setup_host }}"
-    _service_setup_host_python_interpreter: "{{ cinder_service_setup_host_python_interpreter }}"
-    _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 }}"
-        role: "{{ cinder_service_role_names }}"
-  when:
-    - _cinder_is_first_play_host
-  tags:
-    - always
-
 - name: Include ceph_client role
   ansible.builtin.include_role:
     name: ceph_client