From 937cbcf84ff85686480747b16099f68581627879 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Fri, 5 Nov 2021 22:36:51 +0100
Subject: [PATCH] bugfix: removed awx from etc/hosts

- awx uses public ip as bind address
---
 group_vars/stage_dev/plain.yml | 10 ----------
 group_vars/stage_qa/plain.yml  | 12 ++++++------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index cf9287d..b0a59af 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -29,11 +29,6 @@ shared_service_docker_ip: "{{ stage_server_infos
   | map(attribute='private_ip')
   | list
   | first }}"
-shared_service_awx_ip: "{{ stage_server_infos
-  | selectattr('name', 'match', stage + '-awx-01' )
-  | map(attribute='private_ip')
-  | list
-  | first }}"
 shared_service_mail_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-mail-01' )
   | map(attribute='private_ip')
@@ -119,7 +114,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 }}"
@@ -160,10 +154,6 @@ shared_service_hosts: [
     ip: "{{ shared_service_pg_master_ip }}",
     name: "{{ shared_service_postgres_01_hostname }}"
   },
-  {
-    ip: "{{ shared_service_awx_ip }}",
-    name: "{{ shared_service_awx_hostname }}"
-  },
   {
     ip: "{{ shared_service_docker_ip }}",
     name: "{{ shared_service_docker_registry_hostname }}"
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index a97e686..46bdc97 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -76,10 +76,10 @@ shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}"
 shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
 shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
-management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain }}"
-
 shared_service_docker_registry_hostname: "{{ stage }}-docker-registry-01.{{ domain }}"
 
+management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain }}"
+
 keycloak_server_url: "https://{{ shared_service_keycloak_hostname }}"
 
 shared_service_hosts: [
@@ -103,10 +103,6 @@ shared_service_hosts: [
     ip: "{{ shared_service_logstash_01 }}",
     name: "{{ shared_service_elastic_stack_logstash_01_hostname }}"
   },
-  {
-    ip: "{{ shared_service_docker_ip }}",
-    name: "{{ shared_service_docker_registry_hostname }}"
-  },
   {
     ip: "{{ shared_service_maria_ip }}",
     name: "{{ shared_service_maria_hostname }}"
@@ -115,6 +111,10 @@ shared_service_hosts: [
     ip: "{{ shared_service_pg_master_ip }}",
     name: "{{ shared_service_postgres_01_hostname }}"
   },
+  {
+    ip: "{{ shared_service_docker_ip }}",
+    name: "{{ shared_service_docker_registry_hostname }}"
+  },
   {
     ip: "{{ shared_service_mail_ip }}",
     name: "{{ shared_service_mail_hostname }}"