From 08addce2d493a013ebf19366c99e26f039290185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20H=C3=A4hnel?= Date: Mon, 4 Sep 2023 15:35:22 +0000 Subject: [PATCH] Rollout KW 36 --- group_vars/stage_prodnso/prometheus.yml | 6 ++---- host_vars/ext-bdev-mpmexec-02/plain.yml | 16 --------------- host_vars/ext-bdev-mpmexec-02/vault.yml | 27 ------------------------- roles/pgadmin4/vars/main.yml | 2 +- stage-ext | 19 ----------------- stage-ext-netgo-hcloud.yml | 27 ------------------------- 6 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 host_vars/ext-bdev-mpmexec-02/plain.yml delete mode 100644 host_vars/ext-bdev-mpmexec-02/vault.yml delete mode 100644 stage-ext delete mode 100644 stage-ext-netgo-hcloud.yml diff --git a/group_vars/stage_prodnso/prometheus.yml b/group_vars/stage_prodnso/prometheus.yml index a6fd95f..4d3194b 100644 --- a/group_vars/stage_prodnso/prometheus.yml +++ b/group_vars/stage_prodnso/prometheus.yml @@ -5,11 +5,9 @@ prometheus_lvm_hcloudvol_count: 10 prometheus_tsdb_rentention_time: "90d" # check firewall settings -smardigo_connect_extra_servers: - - ext-bdev-mpmexec-02-connect.smardigo.digital +smardigo_connect_extra_servers: [] # check firewall settings -node_exporter_extra_servers: - - ext-bdev-mpmexec-02.smardigo.digital +node_exporter_extra_servers: [] prometheus_remote_write_enabled: false diff --git a/host_vars/ext-bdev-mpmexec-02/plain.yml b/host_vars/ext-bdev-mpmexec-02/plain.yml deleted file mode 100644 index bdee5f3..0000000 --- a/host_vars/ext-bdev-mpmexec-02/plain.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -hetzner_server_labels: "stage={{ stage }} service=connect_simple tenant={{ tenant }}" - -hetzner_server_type: 'cpx51' - -connect_external_subdomain: "ext-bdev-mpmexec-connect" -keycloak_external_subdomain: "ext-bdev-mpmexec-keycloak" - -traefik_dns_01_challenge: false - -sma_jwt_secret: "{{ sma_jwt_secret_vault }}" - -connect_version: "10.3" -connect_email_username: "{{ connect_email_username_vault }}" -connect_email_password: "{{ connect_email_password_vault }}" diff --git a/host_vars/ext-bdev-mpmexec-02/vault.yml b/host_vars/ext-bdev-mpmexec-02/vault.yml deleted file mode 100644 index 6492bf9..0000000 --- a/host_vars/ext-bdev-mpmexec-02/vault.yml +++ /dev/null @@ -1,27 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -34303331663434306466313361366436663531366466313339343465636536633163343439663530 -6438313066353537623764666466383432326561363737330a616262613530323234643164313136 -32306636393432326465643763366563613162396630643364656363633064653465316539393639 -3431396664613332630a336639316632613365303262623462333532633365623237343039643463 -37313832343231343833623138363131383337346363626335613264323439393534353136383132 -64353964363464373237306462316633616436636632613738346339373566343133336262336538 -39316562333930653565303730323931383438353631653033353734373930616338306534636235 -36393035313931313430396661623436373334633237636338663236653132613732363164623138 -32393464306638303231656637323932613361663137656162626665393761393236336130633036 -61623134333239613966663366346437383030313031656637616462613338323561336430613330 -61653339316531643466623537643763656538333866353739326264313637326266393031396563 -64303734663339393562396562366430366438356639376431613363666635646565336133333732 -36636138613664376438306634663861353338633431373530656462643732363039363638613832 -61303235313235303035653737656438396665323437323064346365653031353162346337346137 -34623231323537643361346161356538616166336139366333663035316666303733363334633164 -39343038313930373835633932323334633465376135373162633437666235333061343031343437 -39633136376131633861613031363432356165386538356263646538303230346162343461623532 -32653031623939666539666235656635326262373863323462363539353565356232306565386631 -37643631346263376162366532643662313435386235303631633438383466306638376134643963 -32306132323939326530343533376639356133336239366439396564323130626662383932353838 -33313830383933353935343234623765333961336363666630653661613461363935363032303236 -39323436643537663135336134303561346436666530343662383334616566353063613137393237 -33656564396665353865366237626135613137646534383465333836666531343736333136383065 -38663065623865656637333539336262353962326430623563353833626233653833636165666533 -37306563353838323563346236356138643233316530663064333933336131643433343834313561 -3738363261386563373133633466376565353331363132373735 diff --git a/roles/pgadmin4/vars/main.yml b/roles/pgadmin4/vars/main.yml index 0ab833c..212d7f0 100644 --- a/roles/pgadmin4/vars/main.yml +++ b/roles/pgadmin4/vars/main.yml @@ -40,7 +40,7 @@ pgadmin4_docker: [ '"traefik.enable=true"', '"traefik.http.routers.{{ pgadmin_id }}.service={{ pgadmin_id }}"', - '"traefik.http.routers.{{ pgadmin_id }}.rule=Host(`{{ pgadmin_id }}.{{ domain_env }}`)"', + '"traefik.http.routers.{{ pgadmin_id }}.rule=Host(`{{ shared_service_hostname_pgadmin4 }}`)"', '"traefik.http.routers.{{ pgadmin_id }}.entrypoints=websecure"', '"traefik.http.routers.{{ pgadmin_id }}.tls=true"', '"traefik.http.routers.{{ pgadmin_id }}.tls.certresolver=letsencrypt"', diff --git a/stage-ext b/stage-ext deleted file mode 100644 index acc2ecc..0000000 --- a/stage-ext +++ /dev/null @@ -1,19 +0,0 @@ -[bdev] -ext-bdev-mpmexec-02 - -[connect_compact] -ext-bdev-mpmexec-02 - -[keycloak_compact] -ext-bdev-mpmexec-02 - -[stage_ext:children] -bdev -connect_compact -keycloak_compact - -[all:children] -stage_ext - -[hcloud:children] -stage_ext diff --git a/stage-ext-netgo-hcloud.yml b/stage-ext-netgo-hcloud.yml deleted file mode 100644 index 1d926f5..0000000 --- a/stage-ext-netgo-hcloud.yml +++ /dev/null @@ -1,27 +0,0 @@ -# dynamic inventory for hetzner which reads the stage variable from environment -# -# parameters: -# HETZNER_CLOUD_TOKEN := hetzner cloud api token -# HETZNER_LABEL_SELECTOR := the label selector to use (note: multiple selectors are not supported by rest api) -# (e.g. stage=devnso) -# (e.g. service=prometheus) -# usage: -# export HETZNER_LABEL_SELECTOR='stage=devnso' -# ansible-playbook -i stage-netgo-hcloud.yml ... - -plugin: netgo-hcloud - -stage: "ext" -stage_kube: "ext" -label_selector: "stage=ext" # jinja isn't available here - -api_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63353332336232333466616538613861376561313430343737636161653461393533653365366266 - 3131333435346639666232326465376630313763626431320a393466663564323162366136666630 - 33623135626436366132626361313262623439303966383266646566366362336361643633366130 - 3932643632636539610a303437626635653331373439666262623766353866356337636264303732 - 62626534643965373539663436316437643233613235643236303030633861336162386134663937 - 63363464626266653935383537636539326463343634396632656631643433393466366334313834 - 38323733303535346231663735376433393333336331666462383665316638366139623137613564 - 63316638663765346234