From 9c941e490d13906fd57c6b5469ce11deef05a3a5 Mon Sep 17 00:00:00 2001 From: nate stephany Date: Mon, 16 Mar 2026 13:18:26 +0100 Subject: [PATCH 1/3] ocp4_workload_gitops_bootstrap: Disable agnosticd_user_info data task --- roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml index 52084e5..22c7b4c 100644 --- a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml +++ b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml @@ -148,6 +148,6 @@ loop: "{{ cm_provision_data.resources }}" when: item.data.provision_data is defined - - name: Add data to agnosticd_user_info - agnosticd.core.agnosticd_user_info: - data: "{{ provision_data }}" + # - name: Add data to agnosticd_user_info + # agnosticd.core.agnosticd_user_info: + # data: "{{ provision_data }}" From b67a901bced9c9fea5104d92ecf4ff44c0217e53 Mon Sep 17 00:00:00 2001 From: nate stephany Date: Mon, 16 Mar 2026 14:31:57 +0100 Subject: [PATCH 2/3] disable block --- .../tasks/workload.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml index 22c7b4c..0bb2ef2 100644 --- a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml +++ b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml @@ -138,16 +138,16 @@ - cm_provision_data.resources | map(attribute='data') | map(attribute='provision_data', default='') | select('ne', '') | list | length == cm_provision_data.resources | length failed_when: false -- name: Process ConfigMap provision data, if any - when: - - cm_provision_data.resources | default([]) | length > 0 - block: - - name: Merge provision_data from all ConfigMaps - ansible.builtin.set_fact: - provision_data: "{{ provision_data | default({}) | combine(item.data.provision_data | from_yaml, recursive=True) }}" - loop: "{{ cm_provision_data.resources }}" - when: item.data.provision_data is defined +# - name: Process ConfigMap provision data, if any +# when: +# - cm_provision_data.resources | default([]) | length > 0 +# block: +# - name: Merge provision_data from all ConfigMaps +# ansible.builtin.set_fact: +# provision_data: "{{ provision_data | default({}) | combine(item.data.provision_data | from_yaml, recursive=True) }}" +# loop: "{{ cm_provision_data.resources }}" +# when: item.data.provision_data is defined - # - name: Add data to agnosticd_user_info - # agnosticd.core.agnosticd_user_info: - # data: "{{ provision_data }}" +# - name: Add data to agnosticd_user_info +# agnosticd.core.agnosticd_user_info: +# data: "{{ provision_data }}" From 9acc15ce7dc06d943d0b28b704ca66549e3b1a8d Mon Sep 17 00:00:00 2001 From: nate stephany Date: Mon, 16 Mar 2026 15:25:53 +0100 Subject: [PATCH 3/3] disable remainder of gitops output processing --- .../tasks/workload.yml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml index 0bb2ef2..3fd6963 100644 --- a/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml +++ b/roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml @@ -117,26 +117,26 @@ # : # namespace: {{ $nsName }} -- name: Set the configmap label variable - ansible.builtin.set_fact: - configmap_label: >- - {{ 'demo.redhat.com/tenant-' ~ guid - if ocp4_workload_gitops_bootstrap_application_name == 'bootstrap-tenant' - else 'demo.redhat.com/infra' }} +# - name: Set the configmap label variable +# ansible.builtin.set_fact: +# configmap_label: >- +# {{ 'demo.redhat.com/tenant-' ~ guid +# if ocp4_workload_gitops_bootstrap_application_name == 'bootstrap-tenant' +# else 'demo.redhat.com/infra' }} -- name: Retrieve matching ConfigMaps and wait for provision_data, if any - kubernetes.core.k8s_info: - api_version: v1 - kind: ConfigMap - label_selectors: - - "{{ configmap_label }}" - register: cm_provision_data - retries: 30 - delay: 10 - until: - - cm_provision_data.resources | length > 0 - - cm_provision_data.resources | map(attribute='data') | map(attribute='provision_data', default='') | select('ne', '') | list | length == cm_provision_data.resources | length - failed_when: false +# - name: Retrieve matching ConfigMaps and wait for provision_data, if any +# kubernetes.core.k8s_info: +# api_version: v1 +# kind: ConfigMap +# label_selectors: +# - "{{ configmap_label }}" +# register: cm_provision_data +# retries: 30 +# delay: 10 +# until: +# - cm_provision_data.resources | length > 0 +# - cm_provision_data.resources | map(attribute='data') | map(attribute='provision_data', default='') | select('ne', '') | list | length == cm_provision_data.resources | length +# failed_when: false # - name: Process ConfigMap provision data, if any # when: