DEV-216: added ssh pubkey for fgoerz; changed lookup to find also non-RSA-pubkeys

README.md

@@ -7,6 +7,10 @@
 
     pip3 install ansible jmespath hcloud netaddr
 
+    OR
+
+    pip3 install -r pip-requirements
+
 ## Option 2
 - Install python dependencies with poetry
 
@@ -22,6 +26,10 @@
     ansible-galaxy collection install community.kubernetes
     ansible-galaxy collection install community.mysql
 
+    OR
+
+    ansible-galaxy collection install -r galaxy-requirements.yml
+
 ## With poetry
 
     poetry run ansible-galaxy collection install hetzner.hcloud

galaxy-requirements.yml

@@ -0,0 +1,7 @@
+---
+collections:
+- name: hetzner.hcloud
+  version: 1.6.0
+- name: community.general
+- name: community.kubernetes
+- name: community.mysql

group_vars/all/plain.yml

@@ -27,6 +27,7 @@ hetzner_ssh_keys:
   - sven.ketelsen@netgo.de
   - peter.heise@netgo.de
   - claus.paetow@netgo.de
+  - friedrich.goerz@netgo.de
 
 hetzner_server_labels: "stage={{ stage }}"
 
@@ -66,6 +67,7 @@ smardigo_plattform_users:
   - 'sven.ketelsen'
   - 'peter.heise'
   - 'claus.paetow'
+  - 'friedrich.goerz'
 
 docker_owner: "{{ admin_user }}"
 docker_group: "{{ admin_user }}"

pip-requirements

@@ -0,0 +1,5 @@
+ansible
+ansible-core>=2.10
+hcloud
+jmespath
+netaddr

roles/awx/tasks/awx-config.yml

@@ -137,7 +137,7 @@
     credential_type_id: "{{ awx_credential_type_machine_id }}"
     credential_type_name: "Machine"
     username: "Ansible"
-    ssh_public_key_data: "{{ lookup('file', '{{ playbook_dir }}/users/ansible/id_rsa.pub') }}"
+    ssh_public_key_data: "{{ lookup('file', '{{ playbook_dir }}/users/ansible/ssh.pub') }}"
     ssh_key_data: "{{ ansible_ssh_key_private | replace('\n','\\n') }}"
   uri:
     url: "{{ awx_base_url }}/api/v2/credentials/"

roles/common/tasks/main.yml

@@ -25,7 +25,7 @@
   ansible.posix.authorized_key:
     user: root
     state: present
-    key: "{{ lookup('file', 'users/' + item + '/id_rsa.pub') }}"
+    key: "{{ lookup('file', 'users/' + item + '/ssh.pub') }}"
   loop: '{{ smardigo_plattform_users }}'
   tags:
     - never
@@ -74,7 +74,7 @@
     user: '{{ item }}'
     state: present
     exclusive: true
-    key: "{{ lookup('file', '{{ playbook_dir }}/users/{{ item }}/id_rsa.pub') }}"
+    key: "{{ lookup('file', '{{ playbook_dir }}/users/{{ item }}/ssh.pub') }}"
   loop: '{{ smardigo_plattform_users | difference(["elastic"]) }}'
   tags:
     - users

users/friedrich.goerz/ssh.pub

@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIjCJ1zxCJHz8dfPyGWBZ0v7LDSLNA0dANEmMjuwor0Or7N5NIDJ81/du81i2pq/tUNqYoSa3MG8flRfDhOCoPY= friedrich@NSO-NB01810