5 files changed, 34 insertions, 31 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 }}"
diff --git a/roles/libvirt/tasks/vm-install.yml b/roles/libvirt/tasks/vm-install.yml
index b1d9de8..c0611e5 100644
--- a/roles/libvirt/tasks/vm-install.yml
+++ b/roles/libvirt/tasks/vm-install.yml
@@ -1,12 +1,19 @@
-- name: Copy kickstart file to destination filesystem
+- name: Copy kickstart file to destination filesystem (if defined)
   ansible.builtin.template:
     src: "kickstart/{{ libvirt_vm_kickstart_file }}"
     dest: "/{{ libvirt_vm_destination }}/{{ libvirt_vm_kickstart_file }}"
+  when: libvirt_vm_kickstart_file|length > 0
 
-- name: Create VM in destination filesystem
+- name: Create VM from kickstart in destination filesystem
   ansible.builtin.command: 'virt-install --name {{ libvirt_vm_name }} --memory {{ libvirt_vm_memory }} --vcpus {{ libvirt_vm_vcpus }} --network {{ libvirt_vm_network }} --disk size={{ libvirt_vm_disk_size }},path=/{{ libvirt_vm_destination }}/{{ libvirt_vm_name }}.img,format={{ libvirt_vm_disk_format }} --location {{ libvirt_vm_location_path }}{{ libvirt_vm_location_arguments }} --os-variant {{ libvirt_vm_os }} --initrd-inject=/{{ libvirt_vm_destination }}/{{ libvirt_vm_kickstart_file }} --extra-args="inst.ks=file:/{{ libvirt_vm_kickstart_file }}"'
+  when: libvirt_vm_kickstart_file|length > 0
 
-- name: Remove kickstart file from destination filesystem
+- name: Create VM without kickstart in destination filesystem
+  ansible.builtin.command: 'virt-install --name {{ libvirt_vm_name }} --memory {{ libvirt_vm_memory }} --vcpus {{ libvirt_vm_vcpus }} --network {{ libvirt_vm_network }} --disk size={{ libvirt_vm_disk_size }},path=/{{ libvirt_vm_destination }}/{{ libvirt_vm_name }}.img,format={{ libvirt_vm_disk_format }} --location {{ libvirt_vm_location_path }}{{ libvirt_vm_location_arguments }} --os-variant {{ libvirt_vm_os }}'
+  when: libvirt_vm_kickstart_file|length == 0
+
+- name: Remove kickstart file from destination filesystem (if defined)
   ansible.builtin.file:
     path: "/{{ libvirt_vm_destination }}/{{ libvirt_vm_kickstart_file }}"
     state: absent
+  when: libvirt_vm_kickstart_file|length > 0
diff --git a/roles/libvirt/vars/main.yml b/roles/libvirt/vars/main.yml
index 54fd9e7..1c26e68 100644
--- a/roles/libvirt/vars/main.yml
+++ b/roles/libvirt/vars/main.yml
@@ -1,15 +1,15 @@
 libvirt_vm_name: "{{ inventory_hostname }}"
-libvirt_vm_memory: "{{ memory_mb }}"
-libvirt_vm_vcpus: "{{ cpus }}"
-libvirt_vm_disk_size: "{{ disk_gb }}"
-libvirt_vm_disk_format: "{{ disk_format }}"
-libvirt_vm_os: "{{ os }}"
-libvirt_vm_kickstart_file: "{{ kickstart }}"
+libvirt_vm_memory: "{{ memory_mb if memory_mb is defined else '1024' }}"
+libvirt_vm_vcpus: "{{ cpus if cpus is defined else '1' }}"
+libvirt_vm_disk_size: "{{ disk_gb if disk_gb is defined else '20' }}"
+libvirt_vm_disk_format: "{{ disk_format if disk_format is defined else 'qcow2' }}"
+libvirt_vm_os: "{{ os if os is defined else 'rhel8-unknown' }}"
+libvirt_vm_kickstart_file: "{{ kickstart if kickstart is defined }}"
 libvirt_vm_location_path: "{{ iso_path }}"
 libvirt_vm_destination: "{{ parent_dataset }}/{{ inventory_hostname }}"
-libvirt_vm_network: "{{ network }}"
+libvirt_vm_network: "{{ network if network is defined else 'default' }}"
 libvirt_kickstart_hostname: "{{ inventory_hostname }}"
-libvirt_kickstart_timezone: "{{ timezone }}"
-libvirt_kickstart_root_ssh_key: "{{ ssh_key }}"
-libvirt_kickstart_root_password: "{{ root_password }}"
+libvirt_kickstart_timezone: "{{ timezone if timezone is defined else 'Etc/GMT' }}"
+libvirt_kickstart_root_ssh_key: "{{ ssh_key if ssh_key is defined }}"
+libvirt_kickstart_root_password: "{{ root_password if root_password is defined else lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}"