From 141b066a5cf6fcd579c46c60215280a7662ae5d2 Mon Sep 17 00:00:00 2001
From: ivarmu <26822043+ivarmu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:54:53 +0100
Subject: [PATCH] Fixed the object creation order for the gateway staf.

---
 .../fragments/dispatcher_gateway_order.yml     |  3 +++
 roles/dispatch/defaults/main.yml               | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/fragments/dispatcher_gateway_order.yml

diff --git a/changelogs/fragments/dispatcher_gateway_order.yml b/changelogs/fragments/dispatcher_gateway_order.yml
new file mode 100644
index 000000000..08ebaa1bf
--- /dev/null
+++ b/changelogs/fragments/dispatcher_gateway_order.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fixed the object creation order for the gateway staf.
diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml
index 9d54d1667..5c73535d2 100644
--- a/roles/dispatch/defaults/main.yml
+++ b/roles/dispatch/defaults/main.yml
@@ -9,15 +9,15 @@ gateway_configuration_dispatcher_roles:
   - role: gateway_settings
     var: gateway_settings
     tags: settings
+  - role: gateway_organizations
+    var: aap_organizations
+    tags: organizations
   - role: gateway_applications
     var: aap_applications
     tags: applications
   - role: gateway_http_ports
     var: http_ports_list
     tags: http_ports
-  - role: gateway_organizations
-    var: aap_organizations
-    tags: organizations
   - role: gateway_service_clusters
     var: gateway_service_clusters
     tags: service_clusters
@@ -30,18 +30,18 @@ gateway_configuration_dispatcher_roles:
   - role: gateway_services
     var: gateway_services
     tags: services
-  - role: gateway_role_user_assignments
-    var: gateway_role_user_assignments
-    tags: role_user_assignments
-  - role: gateway_routes
-    var: gateway_routes
-    tags: routes
   - role: gateway_teams
     var: aap_teams
     tags: teams
   - role: gateway_users
     var: aap_user_accounts
     tags: users
+  - role: gateway_role_user_assignments
+    var: gateway_role_user_assignments
+    tags: role_user_assignments
+  - role: gateway_routes
+    var: gateway_routes
+    tags: routes
 
 hub_configuration_dispatcher_roles:
   - role: hub_namespace