[multiple] Uniquify OSDPD names per deployment run

An OpenStackDataPlaneDeployment (OSDPD) is an immutable record of a single
deployment run. Once its Status.Deployed is true, the operator short-circuits
reconciliation with "Already deployed" and will never re-run jobs, even if
the referenced nodesets have since been updated with new content (e.g. new
SSH keys, new node config).

When ci-framework re-applies a deployment stage with oc apply and the OSDPD
already exists from a previous run, the operator ignores it. Meanwhile the
nodeset operator resets DeploymentReady=False because it detects that the
nodeset"s generation has advanced since the last deployment. This produces a
permanent deadlock: the nodeset waits for a deployment that will never run,
and the wait condition times out after 60 minutes.

The correct model is: one OSDPD per deployment *run*, not per nodeset.

Fix by auto-generating a timestamp suffix (YYYYMMDDHHMMSS) once at the
start of the first deployment stage and appending it to the name of every
OpenStackDataPlaneDeployment resource found in the kustomize build output
before applying it. The suffix is stable within a single ansible run (so
both edpm-deployment and edpm-deployment2 share the same suffix) but
differs across runs, producing names like:

  edpm-deployment-20260313215236
  edpm-deployment-20260314093012

Old OSDPDs are left in place as an audit trail of past runs. The operator
only acts on the new CR, so the deadlock cannot occur.

The suffix can be pinned by setting cifmw_kustomize_deploy_osdpd_suffix
explicitly (useful for idempotent re-runs of the same logical deployment).
Leave it empty (the default) for automatic timestamp generation.

Signed-off-by: Ade Lee <alee@redhat.com>
Co-Authored-By: Claude <noreply@anthropic.com>
Made-with: Cursor

Author: 2 people

roles/kustomize_deploy/defaults/main.yml

@@ -218,6 +218,17 @@ cifmw_kustomize_deploy_dp_dest_file: >-
 
 # timeouts and retry configuration
 
+
+# Suffix appended to OpenStackDataPlaneDeployment resource names when applying
+# a deployment stage. Each run produces a uniquely named OSDPD, preventing the
+# "Already deployed" deadlock that occurs when an existing OSDPD with
+# Status.Deployed=true is re-applied on subsequent runs.
+# When empty (the default), a timestamp is auto-generated once at the start of
+# the first deployment stage and reused for all subsequent stages in the same
+# run, so all OSDPDs in a given run share the same suffix.
+# Set explicitly to pin a known value (e.g. for idempotent re-runs).
+cifmw_kustomize_deploy_osdpd_suffix: ""
+
 cifmw_kustomize_deploy_delay: 10
 cifmw_kustomize_deploy_retries_subscription: 90
 cifmw_kustomize_deploy_retries_install_plan: 60

roles/kustomize_deploy/tasks/execute_step.yml

@@ -93,6 +93,16 @@
     - _tag_name not in _skip_tags
     - _tag_name_id not in _skip_tags
   block:
+    - name: Generate OSDPD run suffix (once per play)
+      when: _cifmw_kustomize_deploy_run_suffix is not defined
+      ansible.builtin.set_fact:
+        _cifmw_kustomize_deploy_run_suffix: >-
+          {{
+            cifmw_kustomize_deploy_osdpd_suffix
+            if (cifmw_kustomize_deploy_osdpd_suffix | default('') | length > 0)
+            else (lookup('pipe', 'date +%Y%m%d%H%M%S'))
+          }}
+
     - name: Ensure source files exists
       register: _src
       when:
@@ -241,6 +251,30 @@
             content: "{{ _kustomize_output.stdout }}"
             mode: "0644"
 
+
+        - name: "Uniquify OpenStackDataPlaneDeployment names in {{ stage.path }}"
+          when: _cifmw_kustomize_deploy_run_suffix | default('') | length > 0
+          changed_when: "'Renamed:' in _rename_osdpd.stdout"
+          register: _rename_osdpd
+          ansible.builtin.shell:
+            executable: /bin/bash
+            cmd: |
+              python3 - << 'PYEOF'
+              import yaml, sys
+              path = "{{ _output }}"
+              suffix = "{{ _cifmw_kustomize_deploy_run_suffix }}"
+              with open(path) as f:
+                  docs = [d for d in yaml.safe_load_all(f) if d is not None]
+              for doc in docs:
+                  if doc.get('kind') == 'OpenStackDataPlaneDeployment':
+                      name = doc['metadata']['name']
+                      if not name.endswith('-' + suffix):
+                          doc['metadata']['name'] = name + '-' + suffix
+                          print('Renamed: ' + name + ' -> ' + doc['metadata']['name'])
+              with open(path, 'w') as f:
+                  yaml.dump_all(docs, f, default_flow_style=False)
+              PYEOF
+
         - name: "Store kustomized content in artifacts for {{ stage.path }}"
           ansible.builtin.copy:
             remote_src: true