Update roles

roles/oatakan.windows_virtio/defaults/main.yml

@@ -19,8 +19,17 @@ virtio_driver_directory: >-
         {% set virt_dir = '2k12R2' %}
       {% elif 'Windows Server 2008 R2' in ansible_distribution -%}
         {% set virt_dir = '2k8R2' %}
+      {% elif 'Windows 7' in ansible_distribution -%}
+        {% set virt_dir = 'w7' %}
       {% elif 'Windows 10' in ansible_distribution -%}
         {% set virt_dir = 'w10' %}
       {% else -%}
         {% set virt_dir = 'w10' %}
       {%- endif %}{{ virt_dir }}
+
+qxl_driver: >-
+      {% if 'Windows Server 2008 R2' in ansible_distribution or 'Windows 7' in ansible_distribution -%}
+        {% set qxl_driver_name = 'qxl' %}
+      {% else -%}
+        {% set qxl_driver_name = 'qxldod' %}
+      {%- endif %}{{ qxl_driver_name }}

roles/oatakan.windows_virtio/handlers/main.yml

@@ -13,6 +13,6 @@
   when: virtio_iso_mount_drive | length == 0
   with_items:
     - "{{ ansible_env.TEMP }}\\redhat_balloon.cer"
-    - "{{ ansible_env.TEMP }}\\redhat_qxldod.cer"
+    - "{{ ansible_env.TEMP }}\\redhat_{{ qxl_driver }}.cer"
     - "{{ ansible_env.TEMP }}\\{{ virtio_win_iso_name }}"
     - "{{ ansible_env.TEMP }}\\virtio_iso_extract"

roles/oatakan.windows_virtio/meta/.galaxy_install_info

@@ -1,2 +1,2 @@
-install_date: Wed Jun 24 18:44:36 2020
+install_date: Tue Apr 20 16:13:53 2021
 version: master

roles/oatakan.windows_virtio/tasks/download.yml

@@ -17,7 +17,9 @@
   retries: 5
   notify:
     - Unmount
-  when: ('Windows Server 2008' not in ansible_distribution)
+  when:
+    - ('Windows Server 2008' not in ansible_distribution)
+    - ('Windows 7' not in ansible_distribution)
 
 - include_tasks: extract_iso.yml
-  when: ('Windows Server 2008' in ansible_distribution)
+  when: ('Windows Server 2008' in ansible_distribution) or ('Windows 7' in ansible_distribution)

roles/oatakan.windows_virtio/tasks/extract_iso.yml

@@ -4,6 +4,10 @@
   win_chocolatey:
     name: 7zip
     state: present
+  register: install_7zip
+  until: install_7zip is success
+  delay: 3
+  retries: 5
 
 - name: Ensure temp directory exists for iso
   win_file:

roles/oatakan.windows_virtio/tasks/install.yml

@@ -6,7 +6,7 @@
     virtio_win_virtio_path: "{{ (win_disk_image.mount_path | default(virtio_iso_mount_drive)) + '\\virtio' if virtio_win_ovirt else (win_disk_image.mount_path | default(virtio_iso_mount_drive)) }}"
     virtio_win_iso_name: "{{ virtio_win_iso_name }}"
   when:
-    - virtio_iso_mount_drive | length > 0 or ('Windows Server 2008' not in ansible_distribution)
+    - virtio_iso_mount_drive | length > 0 or ('Windows Server 2008' not in ansible_distribution and 'Windows 7' not in ansible_distribution)
 
 - name: Set the virtio_win_iso_path and virtio_win_virtio_path
   set_fact:
@@ -15,7 +15,7 @@
     virtio_win_iso_name: "{{ virtio_win_iso_name }}"
   when:
     - virtio_iso_mount_drive | length == 0
-    - ('Windows Server 2008' in ansible_distribution)
+    - ('Windows Server 2008' in ansible_distribution) or ('Windows 7' in ansible_distribution)
 
 - name: Get list of all drivers
   win_command: driverquery /V

roles/oatakan.windows_virtio/tasks/install_cert.yml

@@ -1,22 +1,15 @@
 ---
 
-- name: Export Cert from qxldod
-  win_shell: '$cert = (Get-AuthenticodeSignature "{{ virtio_win_virtio_path }}\qxldod\{{ virtio_driver_directory }}\amd64\qxldod.cat").SignerCertificate; [System.IO.File]::WriteAllBytes("{{ ansible_env.TEMP }}\redhat_qxldod.cer", $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert));'
-  when: virtio_driver_directory != '2k8R2'
-
-- name: Export Cert from qxl
-  win_shell: '$cert = (Get-AuthenticodeSignature "{{ virtio_win_virtio_path }}\qxl\{{ virtio_driver_directory }}\amd64\qxl.cat").SignerCertificate; [System.IO.File]::WriteAllBytes("{{ ansible_env.TEMP }}\redhat_qxldod.cer", $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert));'
-  when: virtio_driver_directory == '2k8R2'
+- name: Export Cert from {{ qxl_driver }}
+  win_shell: '$cert = (Get-AuthenticodeSignature "{{ virtio_win_virtio_path }}\{{ qxl_driver }}\{{ virtio_driver_directory }}\amd64\{{ qxl_driver }}.cat").SignerCertificate; [System.IO.File]::WriteAllBytes("{{ ansible_env.TEMP }}\redhat_{{ qxl_driver }}.cer", $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert));'
 
 - name: Export Cert from balloon
   win_shell: '$cert = (Get-AuthenticodeSignature "{{ virtio_win_virtio_path }}\Balloon\{{ virtio_driver_directory }}\amd64\blnsvr.exe").SignerCertificate; [System.IO.File]::WriteAllBytes("{{ ansible_env.TEMP }}\redhat_balloon.cer", $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert));'
 
-- name: Install RH certificate (qxldod) to TrustedPublisher certificate store
-  win_command: 'certutil.exe -f -addstore "TrustedPublisher" {{ ansible_env.TEMP }}\redhat_qxldod.cer'
+- name: Install RH certificates to TrustedPublisher certificate store
+  win_command: 'certutil.exe -f -addstore "TrustedPublisher" {{ ansible_env.TEMP }}\redhat_{{ item }}.cer'
   notify:
     - Delete downloaded
-
-- name: Install RH certificate (Balloon) to TrustedPublisher certificate store
-  win_command: 'certutil.exe -f -addstore "TrustedPublisher" {{ ansible_env.TEMP }}\redhat_balloon.cer'
-  notify:
-    - Delete downloaded
+  loop:
+    - "{{ qxl_driver }}"
+    - balloon

roles/oatakan.windows_virtio/tasks/install_drivers.yml

@@ -1,45 +1,16 @@
 ---
 
-- name: Install the Virtio Network Driver (netkvm)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\NetKVM\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("netkvm")
-
-- name: Install the Virtio Block Driver (viostor)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\viostor\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("viostor")
-
-- name: Install the QXL Graphics Driver (qxldod)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\qxldod\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when:
-    - driver_list.stdout is not search("qxldod")
-    - virtio_driver_directory != '2k8R2'
-
-- name: Install the QXL Graphics Driver (qxl)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\qxl\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when:
-    - driver_list.stdout is not search("qxl")
-    - virtio_driver_directory == '2k8R2'
-
-- name: Install the Balloon Driver (Balloon)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\Balloon\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("balloon")
-
-- name: Install Virtio RNG driver (viorng)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\viorng\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("viorng")
-
-- name: Install Virtio serial driver (vioserial)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\vioserial\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("vioser")
-
-- name: Install Virtio Input driver (vioinput)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\vioinput\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("vioinput")
-
-- name: Install Virtio SCSI Passthrough driver (vioscsi)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\vioscsi\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("vioscsi")
-
-- name: Install pvpanic device driver (pvpanic)
-  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\pvpanic\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
-  when: driver_list.stdout is not search("pvpanic")
+- name: Install the Virtio Drivers
+  win_command: "pnputil -i -a \"{{ virtio_win_virtio_path }}\\{{ item }}\\{{ virtio_driver_directory }}\\{{ ansible_env.PROCESSOR_ARCHITECTURE | lower }}\\*.inf\""
+  when: driver_list.stdout is not search(item|lower)
+  ignore_errors: yes
+  loop:
+    - NetKVM
+    - viostor
+    - "{{ qxl_driver }}"
+    - Balloon
+    - viorng
+    - vioserial
+    - vioinput
+    - vioscsi
+    - pvpanic