bugfix: setup whole dev stage leftovers

group_vars/stage_dev/plain.yml

@@ -29,6 +29,11 @@ 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')
@@ -114,15 +119,16 @@ 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_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: [
@@ -146,10 +152,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 }}"
@@ -158,6 +160,14 @@ 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 }}"
+  },
   {
     ip: "{{ shared_service_mail_ip }}",
     name: "{{ shared_service_mail_hostname }}"

roles/connect-wordpress/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
 
 wordpress_image_name: "{{ shared_service_docker_registry_hostname }}/smardigo/wordpress"
-wordpress_image_version: '1.3.0'
+wordpress_image_version: '1.3.1'

roles/connect/vars/main.yml

@@ -14,10 +14,6 @@ connect_labels: [
   '"traefik.http.routers.{{ connect_id }}-admin.entrypoints=admin-service"',
   '"traefik.http.routers.{{ connect_id }}-admin.tls=true"',
   '"traefik.http.routers.{{ connect_id }}-admin.tls.certresolver=letsencrypt"',
-  '"traefik.http.routers.{{ connect_id }}-admin.middlewares={{ connect_id }}-admin-cors"',
-  '"traefik.http.middlewares.{{ connect_id }}-admin-cors.headers.accesscontrolallowmethods=GET,OPTIONS"',
-  '"traefik.http.middlewares.{{ connect_id }}-admin-cors.headers.accesscontrolalloworigin=*"',
-  '"traefik.http.middlewares.{{ connect_id }}-admin-cors.headers.accesscontrolallowheaders=SMA_USER"',
   '"traefik.http.services.{{ connect_id }}-admin.loadbalancer.server.port={{ management_port }}"',
 ]
 

roles/management/tasks/main.yaml

@@ -6,7 +6,7 @@
   include_role:
     name: connect-postgres
   vars:
-    inventory_hostname: "{{ stage }}-postgres-01"
+    ansible_ssh_host: "{{ stage }}-postgres-01.{{ domain }}"
 
 - name: "Create realm for <{{ inventory_hostname }}> if necessary"
   include_role:

roles/webdav/defaults/main.yaml

@@ -1,4 +1,4 @@
 ---
 
 webdav_image_name: "{{ shared_service_docker_registry_hostname }}/smardigo/smardigo-webdav-app"
-webdav_image_version: "8.2.6"
+webdav_image_version: "8.4.1"

roles/webdav/vars/main.yml

@@ -16,10 +16,6 @@ webdav_labels: [
   '"traefik.http.routers.{{ webdav_id }}-admin.entrypoints=admin-service"',
   '"traefik.http.routers.{{ webdav_id }}-admin.tls=true"',
   '"traefik.http.routers.{{ webdav_id }}-admin.tls.certresolver=letsencrypt"',
-  '"traefik.http.routers.{{ webdav_id }}-admin.middlewares={{ webdav_id }}-admin-cors"',
-  '"traefik.http.middlewares.{{ webdav_id }}-admin-cors.headers.accesscontrolallowmethods=GET,OPTIONS"',
-  '"traefik.http.middlewares.{{ webdav_id }}-admin-cors.headers.accesscontrolalloworigin=*"',
-  '"traefik.http.middlewares.{{ webdav_id }}-admin-cors.headers.accesscontrolallowheaders=SMA_USER"',
   '"traefik.http.services.{{ webdav_id }}-admin.loadbalancer.server.port={{ management_port }}"',
 ]