var key in passwordless and fix sync of olam secret

Author: bgraef

olam/deploy_olam_cluster.yml

@@ -382,6 +382,7 @@
         owner: true
         group: true
         private_key: '/home/{{ username }}/.ssh/{{ private_key }}'
+        ssh_args: "-l {{ username }}"
       delegate_to: "{{ groups['control'][0] }}"
 
 - name: Configure receptor
@@ -433,6 +434,8 @@
 
 - name: Provision awx
   hosts: control[0]
+  vars_files:
+    - default_vars.yml
   become: true
 
   tasks:
@@ -496,6 +499,8 @@
 
 - name: Configure peers
   hosts: control,execution
+  vars_files:
+    - default_vars.yml
   become: true
 
   tasks:

olam/passwordless_setup.yml

@@ -6,16 +6,16 @@
 
 - name: Generate ssh keypair for user
   community.crypto.openssh_keypair:
-    path: ~/.ssh/id_rsa
+    path: "~/.ssh/{{ private_key }}"
     size: 2048
     comment: ol ssh keypair
   become: true
   become_user: "{{ username }}"
 
 - name: Fetch public key file from server
   ansible.builtin.fetch:
-    src: "~/.ssh/id_rsa.pub"
-    dest: "buffer/{{ inventory_hostname }}-id_rsa.pub"
+    src: "~/.ssh/{{ private_key }}.pub"
+    dest: "buffer/{{ inventory_hostname }}-{{ private_key }}.pub"
     flat: true
   become: true
   become_user: "{{ username }}"
@@ -24,7 +24,7 @@
   ansible.posix.authorized_key:
     user: "{{ username }}"
     state: present
-    key: "{{ lookup('file', 'buffer/{{ item }}-id_rsa.pub') }}"
+    key: "{{ lookup('file', 'buffer/{{ item }}-{{ private_key }}.pub') }}"
   loop: "{{ groups['all'] | flatten(levels=1) }}"
   become: true