[reproducer] Refresh premetal config vars from resolved hostvars

In premetal deployments, config variables updated between bootstrap
and pickup were not reflected in reproducer-variables.yml. Merge
the hypervisor's filtered hostvars over the existing bootstrap dump
so new/changed values win while bootstrap-time state is preserved.

Generated-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Michael Burke <michburk@redhat.com>

Author: michburk

roles/reproducer/tasks/overwrite_zuul_vars.yml

@@ -1,71 +1,74 @@
 ---
-# NOTE(dpawlik): Earlier, our idea was to dump vars as
-# it is roles/cifmw_setup/tasks/bootstrap.yml and read it,
-# then dump it and replace reproducer-variables.yml.
-# Normally it make sense, but since we dump zuul_vars in
-# run.yml, we don't need to make such combination, which is
-# more safe - on making host variable dump, some variables
-# might not be defined, so later we can have an issue like:
-#     'cifmw_discovered_image_url' is undefined.
+# Update reproducer-variables.yml on controller-0 with the current
+# hypervisor hostvars, merged over the existing bootstrap dump.
+#
+# At premetal pickup time the hypervisor has all config files loaded
+# as extra vars (via run-uni-reproducer.sh), so hostvars contains
+# every config variable fully resolved, no raw jinja.
+#
+# The filter chain matches configure_bm_ocp_controller.yml, so
+# only (pre|post|cifmw)_ keys survive, minus hypervisor-specific
+# vars that must not reach controller-0.
 
 - name: Check if zuul_vars.yaml file is available
   ansible.builtin.stat:
     path: "{{ ansible_user_dir }}/configs/zuul_vars.yaml"
   register: _current_zuul_vars
 
-- name: Overwrite reproducer-variables.yml when PreMetal used
+- name: Update reproducer-variables.yml from resolved hostvars
   when: _current_zuul_vars.stat.exists
   vars:
-    temp_reproducer_var_path: /tmp/reproducer-variables.yml
-    temp_merged_reproducer_var_path: /tmp/merged-reproducer-variables.yml
+    _filtered_vars: >-
+      {{
+        hostvars[inventory_hostname] | default({}) |
+        dict2items |
+        selectattr('key', 'match',
+                   '^(pre|post|cifmw)_(?!install_yamls|devscripts).*') |
+        rejectattr('key', 'equalto', 'cifmw_target_host') |
+        rejectattr('key', 'equalto', 'cifmw_basedir') |
+        rejectattr('key', 'equalto', 'cifmw_path') |
+        rejectattr('key', 'equalto', 'cifmw_extras') |
+        rejectattr('key', 'equalto', 'cifmw_openshift_kubeconfig') |
+        rejectattr('key', 'equalto', 'cifmw_openshift_token') |
+        rejectattr('key', 'equalto', 'cifmw_networking_env_definition') |
+        rejectattr('key', 'match', '^cifmw_use_(?!lvms).*') |
+        rejectattr('key', 'match', '^cifmw_reproducer.*') |
+        rejectattr('key', 'match', '^cifmw_rhol.*') |
+        rejectattr('key', 'match', '^cifmw_discover.*') |
+        rejectattr('key', 'match', '^cifmw_libvirt_manager.*') |
+        rejectattr('key', 'match', '^cifmw_manage_secrets_(pullsecret|citoken).*') |
+        items2dict
+      }}
   block:
-    - name: Slurp reproducer-variables.yml to hypervisor
+    - name: Slurp existing reproducer-variables.yml from controller-0
       ansible.builtin.slurp:
         src: "{{ cifmw_basedir }}/parameters/reproducer-variables.yml"
-      register: reproducer_original
+      register: _existing_repro_vars
       delegate_to: controller-0
       no_log: "{{ cifmw_nolog | default(true) | bool }}"
 
-    - name: Create temp file reproducer-variables.yml on hypervisor
+    - name: Write merged reproducer-variables.yml to controller-0
+      vars:
+        _merged: >-
+          {{ (_existing_repro_vars.content | b64decode |
+              from_yaml | default({})) |
+             combine(_filtered_vars, recursive=True) }}
       ansible.builtin.copy:
-        content: "{{ reproducer_original.content | b64decode }}"
-        dest: "{{ temp_reproducer_var_path }}"
-        mode: "0664"
-      no_log: "{{ cifmw_nolog | default(true) | bool }}"
-
-    - name: Copy merge yamls script
-      become: true
-      ansible.builtin.copy:
-        src: merge_yaml_override.py
-        dest: /usr/local/bin/merge_yaml_override
-        mode: "0755"
-
-    - name: Execute merge script
-      ansible.builtin.shell: >
-        python3 /usr/local/bin/merge_yaml_override
-        {{ temp_reproducer_var_path }}
-        {{ ansible_user_dir }}/configs/zuul_vars.yaml >
-        {{ temp_merged_reproducer_var_path }}
-      no_log: "{{ cifmw_nolog | default(true) | bool }}"
-
-    - name: Slurp merged reproducer-variables.yml from hypervisor
-      ansible.builtin.slurp:
-        src: "{{ temp_merged_reproducer_var_path }}"
-      register: merged_reproducer_slurp
-      no_log: "{{ cifmw_nolog | default(true) | bool }}"
-
-    - name: Write back merged reproducer-variables.yml
-      ansible.builtin.copy:
-        content: "{{ merged_reproducer_slurp.content | b64decode }}"
+        content: "{{ _merged | to_nice_yaml }}"
         dest: "{{ cifmw_basedir }}/parameters/reproducer-variables.yml"
         mode: "0664"
         backup: true
       no_log: "{{ cifmw_nolog | default(true) | bool }}"
       delegate_to: controller-0
 
-    - name: Overwrite custom-params.yml
+    - name: Write merged custom-params.yml to controller-0
+      vars:
+        _merged: >-
+          {{ (_existing_repro_vars.content | b64decode |
+              from_yaml | default({})) |
+             combine(_filtered_vars, recursive=True) }}
       ansible.builtin.copy:
-        content: "{{ merged_reproducer_slurp.content | b64decode }}"
+        content: "{{ _merged | to_nice_yaml }}"
         dest: "{{ cifmw_basedir }}/artifacts/parameters/custom-params.yml"
         mode: "0664"
       no_log: "{{ cifmw_nolog | default(true) | bool }}"