Adjust Ansible tasks to use V4_CFG_CR_URL, drop use of abandoned V4_C…

…FG_OCI_REGISTRY_URI
sassoftware · Apr 29, 2024 · 65b7b53 · 65b7b53
1 parent b4ad189
commit 65b7b53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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: