From 60371b0ce20a689d874b15bfc2e3cc0152681c55 Mon Sep 17 00:00:00 2001 From: sankar palanivel Date: Tue, 19 Oct 2021 11:44:47 +0100 Subject: [PATCH] Add slave SSH keys In this change, - Add Jenkins slave's SSH public key into jumphost user's authorized_keys file, as this is required to enable users to perform addition/removal of into their Openvpn deployments. Change-Id: I8e152b989109785cd948d9394f113bf26acb210e --- .../tasks/configure-jumphost.yaml | 5 ++++- .../roles/configure-admin-user-access/vars/main.yaml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml index 6255203..c21516f 100644 --- a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml +++ b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml @@ -42,12 +42,15 @@ - name: Append ssh public key to authorized_keys on target nodes lineinfile: path: "{{ admin_user_ssh_dir }}/authorized_keys" - line: "{{ lookup('file', '{{ nolabs_user_public_key }}') }}" + line: "{{ item }}" create: true state: present owner: "{{ admin_user }}" group: "{{ admin_user }}" mode: 0600 + with_items: + - "{{ lookup('file', '{{ nolabs_user_public_key }}') }}" + - "{{ lookup('file', '{{ slave_user_public_key }}') }}" - name: Create SSH keypair for '{{ admin_user }}' openssh_keypair: diff --git a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml index 7292c81..8237ca8 100644 --- a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml +++ b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml @@ -25,4 +25,5 @@ admin_user_ssh_dir: "/home/{{ admin_user }}/.ssh" admin_user_private_key: "/home/{{ admin_user }}/.ssh/id_rsa" admin_user_public_key: "/home/{{ admin_user }}/.ssh/id_rsa.pub" admin_user_jumphost_public_key: "/tmp/{{ admin_user }}_id_rsa.pub" -nolabs_user_public_key: "/tmp/nolabs/id_rsa.pub" \ No newline at end of file +nolabs_user_public_key: "/tmp/nolabs/id_rsa.pub" +slave_user_public_key: "/home/jenkins/.ssh/d_rsa.pub" \ No newline at end of file -- 2.25.1