diff --git a/group_vars/stage_demompmx/plain.yml b/group_vars/stage_demompmx/plain.yml index fb5ec78..33d28a1 100644 --- a/group_vars/stage_demompmx/plain.yml +++ b/group_vars/stage_demompmx/plain.yml @@ -4,9 +4,6 @@ stage: "demompmx" hetzner_server_type_kube_cpl: cpx21 hetzner_server_type_kube_node: cpx31 -custom_stage_platform_users: - - "hp.wissenbach" - # TODO read configuration with hetzner rest api shared_service_network: "10.0.0.0/16" diff --git a/group_vars/stage_devnso/plain.yml b/group_vars/stage_devnso/plain.yml index 77b97c1..1a97360 100644 --- a/group_vars/stage_devnso/plain.yml +++ b/group_vars/stage_devnso/plain.yml @@ -56,8 +56,5 @@ management_oidc_client_secret: "{{ management_oidc_client_secret_vault }}" # push mirror: https://{{ stage }}-gitea-01.smardigo.digital/gitea-admin/communication-keys/ gpg_key_smardigo_automation__private: "{{ gpg_key_smardigo_automation__private__vault }}" -custom_stage_platform_users: - - hp.wissenbach - custom_stage_hetzner_ssh_keys: - "ext.hans-peter.wissenbach@netgo.de" diff --git a/group_vars/stage_devscr/plain.yml b/group_vars/stage_devscr/plain.yml index 39d134d..43e49b1 100644 --- a/group_vars/stage_devscr/plain.yml +++ b/group_vars/stage_devscr/plain.yml @@ -9,7 +9,6 @@ custom_stage_platform_users: - 'daniel.risse' - 'esther.fuhrmann' - 'philipp.eichhorn' - - 'hp.wissenbach' # TODO read configuration with hetzner rest api shared_service_network: "10.1.0.0/16" diff --git a/group_vars/stage_ext/plain.yml b/group_vars/stage_ext/plain.yml deleted file mode 100644 index 9aa2871..0000000 --- a/group_vars/stage_ext/plain.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -stage: "ext" -tenant: "bdev" -hetzner_networks: [] - -docker_enabled: true -docker_config_enabled: false -traefik_enabled: true -filebeat_enabled: false -node_exporter_enabled: true - -# an ext server has no private network -node_exporter_listen_address: "0.0.0.0" - -shared_service_hostname_harbor: "prodnso-harbor-01.smardigo.digital" - -custom_stage_platform_users: - - "daniel.risse" - - "esther.fuhrmann" - - "philipp.eichhorn" - - "hp.wissenbach" diff --git a/group_vars/stage_ext/vault.yml b/group_vars/stage_ext/vault.yml deleted file mode 100644 index a9b91e8..0000000 --- a/group_vars/stage_ext/vault.yml +++ /dev/null @@ -1,14 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -66343866363538346265666163393930666530326639313533343464616264313366346564356136 -3632663734663735396461313564616563623939643138320a653735353334663464623461636234 -35353331393234333937326466383438633538653161636461393138313765623738373961313866 -3565326466393637630a613266633430333430653538373434373836616333613733633065633432 -39353334663235613565313962306237653238613063323237336463316637393331386534373064 -61633338326637326339613731343865616434383264393364323531323638323936326162656234 -39643563333434353630373333313164653565636235646134313638666638323961306530643830 -32366365303165343337353330613139373939353035316136363936303264316563373863336638 -38333936326531613936356266376130633361636236373439363735616431306161326238323761 -65663333306536316462616361393236326262356535663633383530373463653432373239643133 -36663564376330326463363135613534343362383238623535353962386163643434333931626164 -33633030653631353461656630366364313630366461353635316363633637363030396266343061 -3638 diff --git a/group_vars/stage_ext/vault_env.yml b/group_vars/stage_ext/vault_env.yml deleted file mode 100644 index 17e5531..0000000 --- a/group_vars/stage_ext/vault_env.yml +++ /dev/null @@ -1,20 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -65353232613862633830633332326534313164306161646165643461633938616139356334353537 -6434373265636636353531626665316539393739613266380a356165333137333933613739346239 -66366165313963343261653233326239633632646164363666366338633634346530363437383662 -6332343533353335320a363766656138633036643165663863626163376336383939313033393261 -39363430303138636465633037373532346364383131333865646635363761633237396563363466 -39353863333338633139306430343234333966393439313132623739363230613537353834363836 -38636338306332383161316436656632313664343233373637333438643236393732613137616334 -65653233356333366139336338653135383031646233323066666436323235343630316432636139 -35663230383232373939303830356630353631333639643935663234386330653534386530303361 -61373837313539663362396334343565313138656161363364313631653031663336303762613861 -30396137616137633961616632373639656537353130323634663735653032646366323133326362 -65623532386330623131666433633532613132393935316164633031366632356336383531636536 -30653132613033343232613761363133633434336262666534646331666666646631376364613866 -35623039313334303964346335373462356339363063343638613431626661613531383632326365 -33383938623838323165336561316165333832303630626561323834626561323932396332393934 -30306132633837333266633137616135633330663135616463626337643966356434366333646536 -39363866353530616563636139303339643163303939623335613966366433626637353735316133 -37653934343536616164336565366438316538393965343438376161346531366265343335386134 -316233386631616635343165663437333262 diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index 85527a1..cdacdcf 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/group_vars/stage_prodnso/plain.yml @@ -48,6 +48,3 @@ alertmanager_admin_password_htpasswd: "{{ alertmanager_admin_password_htpasswd_v netgo_msteams_hook_cd: "{{ netgo_msteams_hook_cd_vault }}" netgo_msteams_hook_alerting: "{{ netgo_msteams_hook_alerting_vault }}" - -custom_stage_platform_users: - - hp.wissenbach diff --git a/group_vars/stage_qanso/plain.yml b/group_vars/stage_qanso/plain.yml index 4338ccf..b7857c3 100644 --- a/group_vars/stage_qanso/plain.yml +++ b/group_vars/stage_qanso/plain.yml @@ -48,6 +48,3 @@ alertmanager_admin_password_htpasswd: "{{ alertmanager_admin_password_htpasswd_v netgo_msteams_hook_cd: "{{ netgo_msteams_hook_cd_vault }}" netgo_msteams_hook_alerting: "{{ netgo_msteams_hook_alerting_vault }}" - -custom_stage_platform_users: - - "hp.wissenbach" diff --git a/host_vars/demompmx-kube-node-06.yml b/host_vars/demompmx-kube-node-06.yml new file mode 100644 index 0000000..bd9530e --- /dev/null +++ b/host_vars/demompmx-kube-node-06.yml @@ -0,0 +1,2 @@ +--- +hetzner_server_type: cpx41 diff --git a/stage-demompmx b/stage-demompmx index 05d4afa..20d7af0 100644 --- a/stage-demompmx +++ b/stage-demompmx @@ -6,9 +6,6 @@ demompmx-management-01 [elastic] -[gateway] -demompmx-gateway-01 - [gitea] [harbor] @@ -65,6 +62,7 @@ demompmx-kube-node-02 demompmx-kube-node-03 demompmx-kube-node-04 demompmx-kube-node-05 +demompmx-kube-node-06 [postgres:children] postgres01 @@ -77,7 +75,6 @@ kube_node backup connect elastic -gateway gitea harbor iam diff --git a/users/hp.wissenbach/wireguard.yml b/users/hp.wissenbach/wireguard.yml deleted file mode 100644 index de5414f..0000000 --- a/users/hp.wissenbach/wireguard.yml +++ /dev/null @@ -1,3 +0,0 @@ -name: "hp.wissenbach" -public_key: "t35U0S9W80EH6PuE85zvFBr5FJkC2idMCVnd6mawjAc=" -source_ip: "10.200.1.2/32" \ No newline at end of file diff --git a/users/hp.wissenbach/ssh.pub b/users/outdated/hp.wissenbach.2023.12.20.pub similarity index 100% rename from users/hp.wissenbach/ssh.pub rename to users/outdated/hp.wissenbach.2023.12.20.pub