Починил проблему с работой получения фактов для VirtualBox\Windows 10.

don-rumata · Sep 23, 2021 · 715d7ef · 715d7ef
1 parent a24187a
commit 715d7ef
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/tasks/draft.yml b/tasks/draft.yml
@@ -16,6 +16,12 @@
 # http://partnerweb.vmware.com/programs/guestOS/guest-os-customization-matrix.pdf
 # https://github.com/vmware/open-vm-tools
 # https://community.chocolatey.org/packages/vmware-tools#files
+# https://packages.vmware.com/tools/versions
+# https://www.vmware.com/support/ws5/doc/ws_install_silent.html
+# https://docs.vmware.com/en/VMware-Tools/11.3.0/com.vmware.vsphere.vmwaretools.doc/GUID-E45C572D-6448-410F-BFA2-F729F2CDA8AC.html
+
+# https://packages.vmware.com/tools/releases/latest/windows/x64/VMware-tools-11.3.0-18090558-x86_64.exe
+# 11360       esx/0.0     		            11.3.0	    18090558
       # - name: parse html
       #   block:
       #     - uri:

diff --git a/tasks/install-guest-tools-4-virtualbox-windows.yml b/tasks/install-guest-tools-4-virtualbox-windows.yml
@@ -1,22 +1,15 @@
 ---
-- name: Set fact about virtualbox guest iso content root path
+- name: Set fact about virtualbox guest iso content root path 4 Windows 7
   when:
     - ansible_os_family == 'Windows'
+    - ansible_distribution_major_version == '6'
     - ansible_virtualization_type == 'virtualbox'
       or
       ansible_virtualization_type == 'VirtualBox'
     - not (win_virtualbox_service_info.exists)
-  block:
-    # 4 win10
-    - set_fact:
-        virtualbox_guest_additions_iso_content_root_path_fact:
-          '{{ disk_image_out.mount_path }}'
-      when: ansible_distribution_major_version == '10'
-    # 4 win7
-    - set_fact:
-        virtualbox_guest_additions_iso_content_root_path_fact:
-          '{{ ansible_env.TMP }}\vboxwindowsadditions'
-      when: ansible_distribution_major_version == '6'
+  set_fact:
+    virtualbox_guest_additions_iso_content_root_path_fact:
+      '{{ ansible_env.TMP }}\vboxwindowsadditions'
 
 - name: Download {{ virtualbox_guest_additions_iso_basename_fact }} 4 Windows
   when:
@@ -48,6 +41,18 @@
     state: present
   register: disk_image_out
 
+- name: Set fact about virtualbox guest iso content root path 4 Windows 10
+  when:
+    - ansible_os_family == 'Windows'
+    - ansible_distribution_major_version == '10'
+    - ansible_virtualization_type == 'virtualbox'
+      or
+      ansible_virtualization_type == 'VirtualBox'
+    - not (win_virtualbox_service_info.exists)
+  set_fact:
+    virtualbox_guest_additions_iso_content_root_path_fact:
+      '{{ disk_image_out.mount_path }}'
+
 - name: Exract iso over 7-zip 4 Windows 7
   when:
     - ansible_os_family == 'Windows'