Merge branch '7.5.x' into 7.6.x

mansisinha · Jan 31, 2024 · 34ef1a5 · 34ef1a5
2 parents 5446b72 + 1b333ed
commit 34ef1a5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/roles/kafka_broker/tasks/rbac.yml b/roles/kafka_broker/tasks/rbac.yml
@@ -54,6 +54,13 @@
       }
     ) }}"
 
+# store the original Controller properties when Controller and Broker colocated
+- set_fact:
+    kafka_controller_initial_properties: "{{hostvars[inventory_hostname]['kafka_controller_final_properties']}}"
+  when:
+    - kraft_enabled|bool
+    - "inventory_hostname in groups.kafka_controller"
+
 #this is required when we have mTLS enabled
 - name: Add Broker's Principal to Controller's Super Users List
   include_tasks: set_controller_principal.yml
@@ -66,6 +73,13 @@
   when: kraft_enabled|bool and kafka_controller_ssl_mutual_auth_enabled|bool
   run_once: true
 
+# reset the Controller's properties to the original properties when Controller and Broker colocated
+- set_fact:
+    kafka_controller_final_properties: "{{kafka_controller_initial_properties}}"
+  when:
+    - kraft_enabled|bool
+    - "inventory_hostname in groups.kafka_controller"
+
 - name: Create SSL Certificate Directory
   file:
     path: /var/ssl/private

diff --git a/roles/kafka_broker/tasks/set_controller_principal.yml b/roles/kafka_broker/tasks/set_controller_principal.yml
@@ -26,3 +26,8 @@
   include_role:
     name: kafka_controller
     tasks_from: create_config.yml
+
+# reset the Controller's properties to the original properties when Controller and Broker colocated
+- set_fact:
+    kafka_controller_final_properties: "{{kafka_controller_initial_properties}}"
+  when: "inventory_hostname in groups.kafka_controller"