Several fixes by Gemma, unverified

ansible-kvm-vms/roles/os_config/tasks/main.yml

@@ -1,12 +1,5 @@
 ---
-- name: Generate Ignition config for CoreOS/Flatcar
+- name: Generate Cloud-init config
   template:
-    src: ignition.json.j2
-    dest: "/tmp/{{ vm_name }}_ignition.json"
-  when: os_type == "coreos" or os_type == "flatcar"
-
-- name: Generate Cloud-init config for MicroOS
-  template:
-    src: user-data.yaml.j2
+    src: "{{ 'user-data-coreos.yaml.j2' if os_type in ['coreos', 'flatcar'] else 'user-data.yaml.j2' }}"
     dest: "/tmp/{{ vm_name }}_user-data"
-  when: os_type == "microos"

ansible-kvm-vms/roles/os_config/templates/ignition.json.j2

@@ -1,26 +0,0 @@
-{
-  "ignition": {
-    "version": "0.3.0"
-  },
-  "passwd": {
-    "users": [
-      {
-        "name": "{{ vm_user }}",
-        "password_hash": "{{ vm_password | password_hash('sha512') }}",
-        "ssh_public_keys": [
-          "{{ lookup('file', vm_ssh_public_key) }}"
-        ]
-      }
-    ]
-  },
-  "storage": {
-    "files": [
-      {
-        "path": "/etc/ssh/sshd_config.d/permit_root_login.conf",
-        "contents": {
-          "source": "data:text/plain;charset=utf-8,PermitRootLogin yes"
-        }
-      }
-    ]
-  }
-}

ansible-kvm-vms/roles/os_config/templates/user-data-coreos.yaml.j2

@@ -0,0 +1,11 @@
+#cloud-config
+users:
+  - name: {{ vm_user }}
+    passwd: {{ vm_password | password_hash('sha512') }}
+    ssh_authorized_keys:
+      - {{ lookup('file', vm_ssh_public_key | replace('~', lookup('env', 'HOME'))) }}
+    sudo: ALL=(ALL) NOPASSWD:ALL
+write_files:
+  - path: /etc/ssh/sshd_config.d/permit_root_login.conf
+    content: |
+      PermitRootLogin yes

ansible-kvm-vms/roles/os_config/templates/user-data.yaml.j2

@@ -3,6 +3,6 @@ users:
   - name: {{ vm_user }}
     passwd: {{ vm_password | password_hash('sha512') }}
     ssh_authorized_keys:
-      - {{ lookup('file', vm_ssh_public_key) }}
+      - {{ lookup('file', vm_ssh_public_key | replace('~', lookup('env', 'HOME'))) }}
     sudo: ALL=(ALL) NOPASSWD:ALL
     lock_passwd: false

ansible-kvm-vms/roles/vm_provision/tasks/main.yml

@@ -54,11 +54,8 @@
     --graphics none \
     --noautoconsole \
     --boot uefi \
-    {% if os_type == 'coreos' or os_type == 'flatcar' %}
-    --cloud-init user-data=/tmp/{{ vm_name }}_ignition.json
-    {% elif os_type == 'microos' %}
     --cloud-init user-data=/tmp/{{ vm_name }}_user-data
-    {% endif %}
+  args:
   args:
     creates: "/etc/libvirt/qemu/{{ vm_name }}.xml"