diff --git a/charts/argocd-understack/templates/application-argo-events.yaml b/charts/argocd-understack/templates/application-argo-events.yaml index b832dd361..56d44134b 100644 --- a/charts/argocd-understack/templates/application-argo-events.yaml +++ b/charts/argocd-understack/templates/application-argo-events.yaml @@ -22,6 +22,18 @@ spec: ref: deploy repoURL: {{ include "understack.deploy_url" $ }} targetRevision: {{ include "understack.deploy_ref" $ }} + kustomize: + patches: + - patch: | + - op: add + path: /data/UNDERSTACK_PARTITION + value: "{{ index $.Values.appLabels "understack.rackspace.com/partition" | default "" }}" + - op: add + path: /data/UNDERSTACK_SITE + value: "{{ index $.Values.appLabels "understack.rackspace.com/site" | default "" }}" + target: + kind: ConfigMap + name: cluster-metadata syncPolicy: automated: prune: true diff --git a/workflows/argo-events/workflowtemplates/ansible-run.yaml b/workflows/argo-events/workflowtemplates/ansible-run.yaml index c4788f250..9c509386c 100644 --- a/workflows/argo-events/workflowtemplates/ansible-run.yaml +++ b/workflows/argo-events/workflowtemplates/ansible-run.yaml @@ -31,7 +31,7 @@ spec: - "{{ inputs.parameters.project_path }}" - --playbook - "{{ inputs.parameters.playbook }}" - - --cmdline=-i {{ inputs.parameters.inventory_file }} --extra-vars '{{ inputs.parameters.extra_vars }} env=$(UNDERSTACK_ENV) site=$(openstack_region)' -vvv + - --cmdline=-i {{ inputs.parameters.inventory_file }} --extra-vars '{{ inputs.parameters.extra_vars }} env=$(UNDERSTACK_PARTITION) site=$(UNDERSTACK_SITE) partition=$(UNDERSTACK_PARTITION)' -vvv env: - name: NAUTOBOT_TOKEN valueFrom: