From 9f76d05353d14299a00766f1145e0e6d45279235 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Tue, 1 Nov 2022 17:29:53 +0100 Subject: [PATCH] SMA-1993 new platform qa server --- group_vars/all/dns.yml | 1 + group_vars/stage_dev/plain.yml | 45 ++++++++++++-------------- group_vars/stage_prodnso/plain.yml | 42 ++++++++++++------------ group_vars/stage_prodwork01/plain.yml | 13 ++++---- group_vars/stage_qa/plain.yml | 42 ++++++++++++------------ group_vars/ubuntu_docker/plain.yml | 1 + host_vars/prodnso-platform-iaas-01.yml | 15 +++++++++ stage-prodnso | 6 +++- 8 files changed, 91 insertions(+), 74 deletions(-) create mode 100644 host_vars/prodnso-platform-iaas-01.yml diff --git a/group_vars/all/dns.yml b/group_vars/all/dns.yml index 520a2ce..940cb2e 100644 --- a/group_vars/all/dns.yml +++ b/group_vars/all/dns.yml @@ -2,6 +2,7 @@ dns: digitalocean domain: "smardigo.digital" +domain_env: "{{ domain }}" traefik_letsencrypt_provider: "digitalocean" hetzner_dns_api_key: '{{ hetzner_dns_api_key_vault }}' diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index adabbb4..a056784 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -147,30 +147,27 @@ shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03" shared_service_elastic_stack_logstash_01_hostname: "{{ stage }}-elastic-stack-logstash-01" shared_service_elastic_stack_kibana_01_hostname: "{{ stage }}-elastic-stack-kibana-01" - # TODO use {{ domain }} agai when moved to smardigo.dev -kube_master_01_hostname: "{{ stage }}-kube-master-01.smardigo.digital" -kube_master_02_hostname: "{{ stage }}-kube-master-02.smardigo.digital" -kube_master_03_hostname: "{{ stage }}-kube-master-03.smardigo.digital" -kube_node_01_hostname: "{{ stage }}-kube-node-01.smardigo.digital" -kube_node_02_hostname: "{{ stage }}-kube-node-02.smardigo.digital" -kube_node_03_hostname: "{{ stage }}-kube-node-03.smardigo.digital" - - # TODO use {{ domain }} agai when moved to smardigo.dev -shared_service_iam_hostname: "{{ stage }}-iam-01.smardigo.digital" -shared_service_mail_hostname: "{{ stage }}-mail-01.smardigo.digital" -shared_service_gitea_hostname: "{{ stage }}-gitea-01.smardigo.digital" -shared_service_redis_hostname: "{{ stage }}-redis-01.smardigo.digital" -shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.smardigo.digital" -shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.smardigo.digital" -shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.smardigo.digital" -shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.smardigo.digital" -shared_service_pdns_hostname: "{{ stage }}-pdns-01.smardigo.digital" -shared_service_webdav_hostname: "{{ stage }}-webdav-01.smardigo.digital" -shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.smardigo.digital" -shared_service_harbor_hostname: "{{ stage }}-harbor-01.smardigo.digital" - - # TODO use {{ domain }} agai when moved to smardigo.dev -management_service_connect_hostname: "{{ stage }}-management-01-connect.smardigo.digital" +kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain_env }}" +kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain_env }}" +kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain_env }}" +kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain_env }}" +kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain_env }}" +kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain_env }}" + +shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}" +shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}" +shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain_env }}" +shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain_env }}" +shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain_env }}" +shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain_env }}" +shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain_env }}" +shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain_env }}" +shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain_env }}" +shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain_env }}" +shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain_env }}" +shared_service_harbor_hostname: "{{ stage }}-harbor-01.{{ domain_env }}" + +management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain_env }}" keycloak_server_url: "https://{{ shared_service_keycloak_hostname }}" diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index 0514f11..6589b8b 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/group_vars/stage_prodnso/plain.yml @@ -147,27 +147,27 @@ shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03" shared_service_elastic_stack_logstash_01_hostname: "{{ stage }}-elastic-stack-logstash-01" shared_service_elastic_stack_kibana_01_hostname: "{{ stage }}-elastic-stack-kibana-01" -kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain }}" -kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain }}" -kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain }}" -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_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 }}-kube-awx.{{ domain }}" -shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" -shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}" -shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" -shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" -shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}" -shared_service_harbor_hostname: "{{ stage }}-harbor-01.{{ domain }}" - -management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain }}" +kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain_env }}" +kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain_env }}" +kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain_env }}" +kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain_env }}" +kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain_env }}" +kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain_env }}" + +shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}" +shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}" +shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain_env }}" +shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain_env }}" +shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain_env }}" +shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain_env }}" +shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain_env }}" +shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain_env }}" +shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain_env }}" +shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain_env }}" +shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain_env }}" +shared_service_harbor_hostname: "{{ stage }}-harbor-01.{{ domain_env }}" + +management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain_env }}" keycloak_server_url: "https://{{ shared_service_keycloak_hostname }}" diff --git a/group_vars/stage_prodwork01/plain.yml b/group_vars/stage_prodwork01/plain.yml index d18e1ca..5852779 100644 --- a/group_vars/stage_prodwork01/plain.yml +++ b/group_vars/stage_prodwork01/plain.yml @@ -6,7 +6,6 @@ default_plattform_users: - 'friedrich.goerz' - 'sven.ketelsen' - 'michael.haehnel' - - 'philipp.eichhorn' - 'hoan.to' - '{{ awx_ansible_user_name }}' - '{{ gitlab_ansible_user_name }}' @@ -52,12 +51,12 @@ shared_service_kube_node_03: "{{ stage_server_infos shared_service_kube_ip: "{{ stage_private_ingress_loadbalancer_ip | default('-') }}" -kube_cpl_01_hostname: "{{ stage }}-kube-cpl-01.{{ domain }}" -kube_cpl_02_hostname: "{{ stage }}-kube-cpl-02.{{ domain }}" -kube_cpl_03_hostname: "{{ stage }}-kube-cpl-03.{{ domain }}" -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 }}" +kube_cpl_01_hostname: "{{ stage }}-kube-cpl-01.{{ domain_env }}" +kube_cpl_02_hostname: "{{ stage }}-kube-cpl-02.{{ domain_env }}" +kube_cpl_03_hostname: "{{ stage }}-kube-cpl-03.{{ domain_env }}" +kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain_env }}" +kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain_env }}" +kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain_env }}" shared_service_hosts: [ { diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml index 662bddd..24dec6e 100644 --- a/group_vars/stage_qa/plain.yml +++ b/group_vars/stage_qa/plain.yml @@ -147,27 +147,27 @@ shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03" shared_service_elastic_stack_logstash_01_hostname: "{{ stage }}-elastic-stack-logstash-01" shared_service_elastic_stack_kibana_01_hostname: "{{ stage }}-elastic-stack-kibana-01" -kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain }}" -kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain }}" -kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain }}" -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_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 }}-kube-awx.{{ domain }}" -shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" -shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}" -shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" -shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" -shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}" -shared_service_harbor_hostname: "{{ stage }}-harbor-01.{{ domain }}" - -management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain }}" +kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain_env }}" +kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain_env }}" +kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain_env }}" +kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain_env }}" +kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain_env }}" +kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain_env }}" + +shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}" +shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}" +shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain_env }}" +shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain_env }}" +shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain_env }}" +shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain_env }}" +shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain_env }}" +shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain_env }}" +shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain_env }}" +shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain_env }}" +shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain_env }}" +shared_service_harbor_hostname: "{{ stage }}-harbor-01.{{ domain_env }}" + +management_service_connect_hostname: "{{ stage }}-management-01-connect.{{ domain_env }}" keycloak_server_url: "https://{{ shared_service_keycloak_hostname }}" diff --git a/group_vars/ubuntu_docker/plain.yml b/group_vars/ubuntu_docker/plain.yml index b8d1765..3b19b97 100644 --- a/group_vars/ubuntu_docker/plain.yml +++ b/group_vars/ubuntu_docker/plain.yml @@ -2,6 +2,7 @@ dns: hetzner domain: "smardigo.dev" +domain_env: "smardigo.digital" traefik_letsencrypt_provider: "hetzner" hetzner_server_type: cpx21 diff --git a/host_vars/prodnso-platform-iaas-01.yml b/host_vars/prodnso-platform-iaas-01.yml new file mode 100644 index 0000000..6278a49 --- /dev/null +++ b/host_vars/prodnso-platform-iaas-01.yml @@ -0,0 +1,15 @@ +--- + +hetzner_server_type: cpx41 + +default_plattform_users: + - 'claus.paetow' + - 'friedrich.goerz' + - 'sven.ketelsen' + - 'michael.haehnel' + - 'hoan.to' + - '{{ awx_ansible_user_name }}' + - '{{ gitlab_ansible_user_name }}' + - 'daniel.risse' + - 'esther.fuhrmann' + - 'philipp.eichhorn' diff --git a/stage-prodnso b/stage-prodnso index 546ebf1..2bf4e74 100644 --- a/stage-prodnso +++ b/stage-prodnso @@ -52,6 +52,9 @@ prodnso-prometheus-01 [redis] #prodnso-redis-01 +[ubuntu_docker] +prodnso-platform-iaas-01 + [webdav] #prodnso-webdav-01 @@ -78,7 +81,6 @@ kube_node backup connect elastic -pdns gitea harbor iam @@ -88,11 +90,13 @@ kibana logstash management maria +pdns pgadmin4 postfix postgres prometheus redis +ubuntu_docker webdav [all:children]