From 6394d9150cfa274349d04e57c4339244c42560d1 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 18 Mar 2022 13:05:57 +0100 Subject: [PATCH] bugfix: awx uses now own user for automation --- group_vars/all/plain.yml | 7 ++++--- roles/kubernetes/awx/defaults/main.yml | 2 -- users/gitlabci/ssh.pub | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 users/gitlabci/ssh.pub diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml index 38659ec..f55a419 100644 --- a/group_vars/all/plain.yml +++ b/group_vars/all/plain.yml @@ -58,9 +58,9 @@ alertmanager_channel_smardigo: "#monitoring-{{ stage }}" hetzner_server_type: cx11 hetzner_server_image: ubuntu-20.04 -# Used for root-access +# used for root-access by hetzner on server creation (@see cloud console/security/ssh-keys) hetzner_ssh_keys: - - gitlabci@git.dev-at.de + - awx@netgo.de - sven.ketelsen@netgo.de - peter.heise@netgo.de - claus.paetow@netgo.de @@ -93,6 +93,7 @@ sudo_group: "{{ sudo_groups awx_ansible_user_name: "awx" awx_ansible_user_ssh_key_private: "{{ ansible_ssh_key_private_vault }}" +awx_credential_machine_hetzner_name: hetzner-ansible-ssh # whitelist for outdated user detection - they wont't be deleted at all default_plattform_users: @@ -122,7 +123,7 @@ ip_whitelist: - "{{ shared_service_network }}" # for test purpose DEV-361 -# currently (march2022) set to IP of hetzner VM +# currently (2022.03.18) set to IP of hetzner VM gitlab_storage_server: 167.235.18.147/32 docker_owner: "{{ admin_user }}" diff --git a/roles/kubernetes/awx/defaults/main.yml b/roles/kubernetes/awx/defaults/main.yml index 059fae1..b4a99e8 100644 --- a/roles/kubernetes/awx/defaults/main.yml +++ b/roles/kubernetes/awx/defaults/main.yml @@ -5,8 +5,6 @@ awx_admin_password: "{{ awx_admin_password_vault }}" awx_ansible_username: ansible awx_ansible_password: ansible -awx_credential_machine_hetzner_name: hetzner-ansible-ssh - # TODO # reason: IT DOES NOT SCALE!!!! # plz move it so separate DIR and do a lookup for all file in $DIR diff --git a/users/gitlabci/ssh.pub b/users/gitlabci/ssh.pub deleted file mode 100644 index 56912f1..0000000 --- a/users/gitlabci/ssh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC56R1WdRlekdRxDNM2r4pIK+y0t/mzplmZQxXXMxlWVIH8l4Sdqt6K/vteiX8kAepaPmqCo8iV16Dh2a5pxI1TnziJhoY9OmAu75qn/NRj9ePm0ZC/XjULcZS2GhlxlonVb//bvU6uwK4z1cbgsTkp4da39KLd7yyH2mBkCeKpAubp0Tqzve8uf15PUVU6aRF2YLqqhlOut3capISDnp9HTwQxEO6Kxy4qK0gyn18CCl83ThkT1QRJ8xs4vmDCsdv8KH+ia5PwdKX0taQji5oH5iL3in/fAfSTQoutWWPNWMHlUsmkPOml78zGzsRNa9y3CLUFLvQtuBk+o++dn23UAW495juj01i+VE1GsgGUQTjp7X2Ok3X7Ps4vKixLzVx6bTsLdEQCMyQZybAY9OGkGbLO1DpEciIK2NNwmBDZELVKVPcQrZ7TjG55goGP04505YA0XkbdMocO4ko0sAdPvcWF/60hVpORWzbMXl+f0QX5ll/ZsSylpwcDCMKV+zc= gitlabci@git.dev-at.de