From 65b7b53756abcc4cfb038917e452bec55ca05223 Mon Sep 17 00:00:00 2001 From: dhoucgitter Date: Mon, 29 Apr 2024 18:28:31 +0000 Subject: [PATCH] Adjust Ansible tasks to use V4_CFG_CR_URL, drop use of abandoned V4_CFG_OCI_REGISTRY_URI --- roles/baseline/tasks/main.yaml | 8 ++++---- roles/vdm/tasks/main.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/baseline/tasks/main.yaml b/roles/baseline/tasks/main.yaml index 1067cf53..bd9c4e1a 100644 --- a/roles/baseline/tasks/main.yaml +++ b/roles/baseline/tasks/main.yaml @@ -3,17 +3,17 @@ --- -- name: Authenticate helm to V4_CFG_OCI_REGISTRY_URI +- name: Helm authenticate to private repository when: - - V4_CFG_OCI_REGISTRY_URI is defined - - V4_CFG_OCI_REGISTRY_URI is not none + - V4_CFG_DARK_SITE_ENABLED is defined + - V4_CFG_DARK_SITE_ENABLED - V4_CFG_CR_USER is defined - V4_CFG_CR_USER is not none - V4_CFG_CR_PASSWORD is defined - V4_CFG_CR_PASSWORD is not none command: cmd: | - helm registry login {{ V4_CFG_OCI_REGISTRY_URI }} -u {{ V4_CFG_CR_USER }} --password-stdin + helm registry login {{ V4_CFG_CR_URL }} -u {{ V4_CFG_CR_USER }} --password-stdin args: stdin: "{{ V4_CFG_CR_PASSWORD }}" tags: diff --git a/roles/vdm/tasks/main.yaml b/roles/vdm/tasks/main.yaml index 64f5ac60..2f0795a8 100644 --- a/roles/vdm/tasks/main.yaml +++ b/roles/vdm/tasks/main.yaml @@ -63,17 +63,17 @@ - uninstall - update -- name: Authenticate helm to V4_CFG_OCI_REGISTRY_URI +- name: Helm authenticate to private repository when: - - V4_CFG_OCI_REGISTRY_URI is defined - - V4_CFG_OCI_REGISTRY_URI is not none + - V4_CFG_DARK_SITE_ENABLED is defined + - V4_CFG_DARK_SITE_ENABLED - V4_CFG_CR_USER is defined - V4_CFG_CR_USER is not none - V4_CFG_CR_PASSWORD is defined - V4_CFG_CR_PASSWORD is not none command: cmd: | - helm registry login {{ V4_CFG_OCI_REGISTRY_URI }} -u {{ V4_CFG_CR_USER }} --password-stdin + helm registry login {{ V4_CFG_CR_URL }} -u {{ V4_CFG_CR_USER }} --password-stdin args: stdin: "{{ V4_CFG_CR_PASSWORD }}" tags: