From dc97cd4c1f6a1b48841ed1755242d6996112582a Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Mon, 5 Jun 2023 11:02:27 +0200 Subject: [PATCH] DEV-1070 stage demo mpmx uses now prodnso --- group_vars/all/awx.yml | 2 +- group_vars/stage_demompmx/awx.yml | 4 ++-- roles/kubernetes/awx/tasks/awx-config.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/all/awx.yml b/group_vars/all/awx.yml index 05c68e6..2ae6148 100644 --- a/group_vars/all/awx.yml +++ b/group_vars/all/awx.yml @@ -6,7 +6,7 @@ awx_oidc_admin_username: "{{ awx_admin_username }}" awx_oidc_admin_password: "{{ awx_admin_password }}" awx_oidc_admin_email: "{{ devops_email_address }}" -awx_custom_ee_image: "{{ shared_service_hostname_harbor }}/awx/awx-custom-ee" +awx_custom_ee_image: "/awx/awx-custom-ee" awx_ansible_user_name: "awx" awx_ansible_user_ssh_key_private: "{{ ansible_ssh_key_private_vault }}" diff --git a/group_vars/stage_demompmx/awx.yml b/group_vars/stage_demompmx/awx.yml index 728af57..0dd892d 100644 --- a/group_vars/stage_demompmx/awx.yml +++ b/group_vars/stage_demompmx/awx.yml @@ -2,5 +2,5 @@ awx_admin_username: "awx-admin" awx_admin_password: "{{ awx_admin_password_vault }}" -awx_hetzner_ansible_revision: "main" -awx_custom_ee_image: "{{ shared_service_hostname_harbor }}/prodnso/awx/awx-custom-ee" +awx_hetzner_ansible_revision: "prodnso" +awx_custom_ee_image: "/prodnso/awx/awx-custom-ee" diff --git a/roles/kubernetes/awx/tasks/awx-config.yml b/roles/kubernetes/awx/tasks/awx-config.yml index 6df0ea7..9a19377 100644 --- a/roles/kubernetes/awx/tasks/awx-config.yml +++ b/roles/kubernetes/awx/tasks/awx-config.yml @@ -365,7 +365,7 @@ vars: name: "hetzner-ansible" description: "hetzner-ansible" - image: "{{ awx_custom_ee_image }}" + image: "{{ shared_service_hostname_harbor }}{{ awx_custom_ee_image }}" credential: "{{ awx_credential_harbor_id }}" pull: "always" uri: