Merge pull request #1877 from confluentinc/pr_merge_from_7_8_x_to_7_9_x

Merge Conflict Resolution (from 7.8.x to 7.9.x)
confluentinc · Jan 13, 2025 · caa035e · caa035e
2 parents ac1c55f + ac148b3
commit caa035e
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/roles/kafka_controller/tasks/get_meta_properties.yml b/roles/kafka_controller/tasks/get_meta_properties.yml
@@ -20,23 +20,12 @@
   register: zoo_cluster
   when: kraft_migration|bool
 
-- name: Create SCRAM Credentials
-  set_fact:
-    scram_credentials: >-
-      {% if 'SCRAM-SHA-512' in kafka_sasl_enabled_mechanisms %}
-      SCRAM-SHA-512=[name={{ sasl_scram_users_final.admin.principal }},password={{ sasl_scram_users_final.admin.password }}]
-      {% endif %}
-      {% if 'SCRAM-SHA-512' in kafka_sasl_enabled_mechanisms and 'SCRAM-SHA-256' in kafka_sasl_enabled_mechanisms %} {% endif %}
-      {% if 'SCRAM-SHA-256' in kafka_sasl_enabled_mechanisms %}
-      SCRAM-SHA-256=[name={{ sasl_scram256_users_final.admin.principal }},password={{ sasl_scram256_users_final.admin.password }}]
-      {% endif %}
-  when: "'SCRAM-SHA-512' in kafka_sasl_enabled_mechanisms or 'SCRAM-SHA-256' in kafka_sasl_enabled_mechanisms"
-
 - name: Format Data Directory and Add Scram Credentials
   shell: |
     {{ binary_base_path }}/bin/kafka-storage format \
     -t={{ clusterid }} -c {{ kafka_controller.config_file }} \
-    {% if scram_credentials is defined %}--add-scram '{{ scram_credentials | trim }}'{% endif %} \
+    {% if 'SCRAM-SHA-512' in kafka_sasl_enabled_mechanisms %}--add-scram 'SCRAM-SHA-512=[name={{ sasl_scram_users_final.admin.principal }},password={{ sasl_scram_users_final.admin.password }}]' {% endif %} \
+    {% if 'SCRAM-SHA-256' in kafka_sasl_enabled_mechanisms %}--add-scram 'SCRAM-SHA-256=[name={{ sasl_scram256_users_final.admin.principal }},password={{ sasl_scram256_users_final.admin.password }}]' {% endif %} \
     --ignore-formatted
   register: format_meta
   vars: