adding default variables, removing need for kickstart, paving the way for non-kickstart installations

3 files changed, 14 insertions, 18 deletions

diff --git a/roles/guest-configure/tasks/main.yml b/roles/guest-configure/tasks/main.yml
index 4e4b429..47a5f27 100644
--- a/roles/guest-configure/tasks/main.yml
+++ b/roles/guest-configure/tasks/main.yml
@@ -6,12 +6,15 @@
 
 - name: Import user creation task
   ansible.builtin.import_tasks: user.yml
+  when: guest_configure_user|length > 0
 
 - name: Import update task
   ansible.builtin.import_tasks: update.yml
 
 - name: Import packages task
   ansible.builtin.import_tasks: packages.yml
+  when: guest_configure_packages|length > 0
 
 - name: Import services task
   ansible.builtin.import_tasks: services.yml
+  when: guest_configure_services|length > 0
diff --git a/roles/guest-configure/tasks/user.yml b/roles/guest-configure/tasks/user.yml
index c0e418b..7039492 100644
--- a/roles/guest-configure/tasks/user.yml
+++ b/roles/guest-configure/tasks/user.yml
@@ -2,6 +2,13 @@
   ansible.builtin.user:
     name: "{{ guest_configure_user }}"
 
+- name: Add user SSH key (if defined)
+  ansible.posix.authorized_key:
+    user: "{{ guest_configure_user }}"
+    state: present
+    key: "{{ guest_configure_ssh_key }}"
+  when: guest_configure_ssh_key|length > 0
+
 - name: RedHat block
   block:
     - name: Add user to sudo group (RedHat)
@@ -35,18 +42,3 @@
         line: '%sudo ALL=(ALL) NOPASSWD: ALL'
         validate: 'visudo -cf %s'
   when: ansible_os_family == "Debian"
-
-- name: Create user .ssh folder
-  ansible.builtin.file:
-    path: "/home/{{ guest_configure_user }}/.ssh/"
-    state: directory
-    mode: "0700"
-    owner: "{{ guest_configure_user }}"
-
-- name: Copy root ssh authorized_keys key to new user
-  ansible.builtin.copy:
-    src: "/root/.ssh/authorized_keys"
-    dest: "/home/{{ guest_configure_user }}/.ssh/authorized_keys"
-    remote_src: yes
-    mode: "0600"
-    owner: "{{ guest_configure_user }}"
diff --git a/roles/guest-configure/vars/main.yml b/roles/guest-configure/vars/main.yml
index 10881fb..70d90a4 100644
--- a/roles/guest-configure/vars/main.yml
+++ b/roles/guest-configure/vars/main.yml
@@ -1,6 +1,7 @@
 ansible_ssh_common_args: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 ansible_user: root
 
-guest_configure_user: "{{ user }}"
-guest_configure_packages: "{{ packages }}"
-guest_configure_services: "{{ services }}"
+guest_configure_user: "{{ user if user is defined }}"
+guest_configure_ssh_key: "{{ ssh_key if ssh_key is defined }}"
+guest_configure_packages: "{{ packages if packages is defined }}"
+guest_configure_services: "{{ services if services is defined }}"