From bd6fb2f189646ba51fa214f2b409716f358323e7 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Tue, 1 Mar 2022 21:52:38 +0100 Subject: [PATCH] DEV-341: cleanup after merge - removed shared_service_awx_hostname --- group_vars/stage_dev/plain.yml | 1 - group_vars/stage_prodnso/plain.yml | 3 ++- group_vars/stage_qa/plain.yml | 1 - roles/management/defaults/main.yml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index 3ffdc59..ba885ce 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -153,7 +153,6 @@ kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain }}" kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain }}" kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain }}" -shared_service_awx_hostname: "{{ stage }}-awx-01.{{ domain }}" shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}" shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain }}" diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index 3fe7ff7..450507c 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/group_vars/stage_prodnso/plain.yml @@ -148,11 +148,12 @@ kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain }}" kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain }}" kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain }}" -shared_service_awx_hostname: "{{ stage }}-awx-01.{{ domain }}" shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}" shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain }}" shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}" +shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}" +shared_service_kube_awx_hostname: "{{ stage }}-awx-01.{{ domain }}" shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml index 5fcbbec..1ff995e 100644 --- a/group_vars/stage_qa/plain.yml +++ b/group_vars/stage_qa/plain.yml @@ -153,7 +153,6 @@ kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain }}" kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain }}" kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain }}" -shared_service_awx_hostname: "{{ stage }}-awx-01.{{ domain }}" shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}" shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain }}" diff --git a/roles/management/defaults/main.yml b/roles/management/defaults/main.yml index 8969f55..98f6b1f 100644 --- a/roles/management/defaults/main.yml +++ b/roles/management/defaults/main.yml @@ -8,7 +8,7 @@ connect_connections: authType: "NO_AUTH" - id: "awx" name: "AWX" - url: "http://{{ shared_service_awx_hostname }}/" + url: "https://{{ shared_service_kube_awx_hostname }}/" connectionType: "HTTP" authType: "BASIC_AUTH" username: "{{ awx_admin_username }}"