From 99d301234a011bd405f4982fc789fc7ddfc36e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6rz=2C=20Friedrich?= <friedrich.goerz@tolina.local>
Date: Wed, 6 Oct 2021 11:17:07 +0000
Subject: [PATCH] DEV-216: added ssh pubkey for fgoerz; changed lookup to find
 also non-RSA-pubkeys

---
 README.md                                   | 8 ++++++++
 galaxy-requirements.yml                     | 7 +++++++
 group_vars/all/plain.yml                    | 2 ++
 pip-requirements                            | 5 +++++
 roles/awx/tasks/awx-config.yml              | 2 +-
 roles/common/tasks/main.yml                 | 4 ++--
 users/claus.paetow/{id_rsa.pub => ssh.pub}  | 0
 users/friedrich.goerz/ssh.pub               | 1 +
 users/peter.heise/{id_rsa.pub => ssh.pub}   | 0
 users/sven.ketelsen/{id_rsa.pub => ssh.pub} | 0
 10 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 galaxy-requirements.yml
 create mode 100644 pip-requirements
 rename users/claus.paetow/{id_rsa.pub => ssh.pub} (100%)
 create mode 100644 users/friedrich.goerz/ssh.pub
 rename users/peter.heise/{id_rsa.pub => ssh.pub} (100%)
 rename users/sven.ketelsen/{id_rsa.pub => ssh.pub} (100%)

diff --git a/README.md b/README.md
index 103152d..5a308fa 100644
--- a/README.md
+++ b/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
diff --git a/galaxy-requirements.yml b/galaxy-requirements.yml
new file mode 100644
index 0000000..692eb62
--- /dev/null
+++ b/galaxy-requirements.yml
@@ -0,0 +1,7 @@
+---
+collections:
+- name: hetzner.hcloud
+  version: 1.6.0
+- name: community.general
+- name: community.kubernetes
+- name: community.mysql
diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index 7dfd151..3df6b9f 100644
--- a/group_vars/all/plain.yml
+++ b/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 }}"
diff --git a/pip-requirements b/pip-requirements
new file mode 100644
index 0000000..213a1c7
--- /dev/null
+++ b/pip-requirements
@@ -0,0 +1,5 @@
+ansible
+ansible-core>=2.10
+hcloud
+jmespath
+netaddr
diff --git a/roles/awx/tasks/awx-config.yml b/roles/awx/tasks/awx-config.yml
index 7c9f8db..73e1339 100644
--- a/roles/awx/tasks/awx-config.yml
+++ b/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/"
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 94b828c..0bfb96a 100644
--- a/roles/common/tasks/main.yml
+++ b/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
diff --git a/users/claus.paetow/id_rsa.pub b/users/claus.paetow/ssh.pub
similarity index 100%
rename from users/claus.paetow/id_rsa.pub
rename to users/claus.paetow/ssh.pub
diff --git a/users/friedrich.goerz/ssh.pub b/users/friedrich.goerz/ssh.pub
new file mode 100644
index 0000000..8eaeb68
--- /dev/null
+++ b/users/friedrich.goerz/ssh.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIjCJ1zxCJHz8dfPyGWBZ0v7LDSLNA0dANEmMjuwor0Or7N5NIDJ81/du81i2pq/tUNqYoSa3MG8flRfDhOCoPY= friedrich@NSO-NB01810
diff --git a/users/peter.heise/id_rsa.pub b/users/peter.heise/ssh.pub
similarity index 100%
rename from users/peter.heise/id_rsa.pub
rename to users/peter.heise/ssh.pub
diff --git a/users/sven.ketelsen/id_rsa.pub b/users/sven.ketelsen/ssh.pub
similarity index 100%
rename from users/sven.ketelsen/id_rsa.pub
rename to users/sven.ketelsen/ssh.pub