From 3e159c904b0e99638eb6521a6d9b9b14a5fde2c5 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@gmail.com>
Date: Fri, 7 Jun 2024 21:21:55 +0000
Subject: [PATCH] Revert "Handle removal of wrong role assignment"

This reverts commit 1fb52c9a4c16e323e99e73cfc601641ae9a2fa8c.

Reason for revert: We've backported the patch to 2024.1 initial release, which means
that upgrade path will be handled by 2024.1 itself with no need to keep
the code for any longer.

Change-Id: I5f5f594d78e3cdda0823ba155a5efdb3d67d3dec
---
 tasks/heat_service_setup.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tasks/heat_service_setup.yml b/tasks/heat_service_setup.yml
index 8ff71a2..62181fa 100644
--- a/tasks/heat_service_setup.yml
+++ b/tasks/heat_service_setup.yml
@@ -61,14 +61,6 @@
         project:
         role: "{{ keystone_role_name | default('admin') }}"
       - role: heat_stack_user
-      # NOTE(noonedeadpunk): removal of role assignment below is for upgrade purposes only
-      #                      and should be removed in future releases
-      - name: "{{ keystone_admin_user_name | default('admin') }}"
-        project: "{{ heat_service_project_name }}"
-        domain: "{{ heat_service_user_domain_id }}"
-        role:
-          - name: "{{ heat_stack_owner_name }}"
-            state: absent
     _service_endpoints:
       - service: "{{ heat_service_name }}"
         interface: "public"