Improve guest addon installation for VirtualBox Guests

This commit is contained in:
Alexander Grothe 2019-03-26 09:17:59 +01:00
parent c88f919380
commit 251a9b978d
3 changed files with 14 additions and 4 deletions

View File

@ -5501,6 +5501,7 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest")
# ubuntu-drivers-common tries to autoinstall # ubuntu-drivers-common tries to autoinstall
# conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :( # conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :(
# also alternates between virtualbox-guest-dkms and virtualbox-guest-dkms-hwe on successive runs
#+END_SRC #+END_SRC
** autoinstall-virtualbox-guest ** autoinstall-virtualbox-guest
:PROPERTIES: :PROPERTIES:
@ -5512,6 +5513,10 @@ This role installs the guest additions for virtualbox guests on Ubuntu 18.04
--- ---
# file roles/autoinstall-virtualbox-guest/tasks/main.yml # file roles/autoinstall-virtualbox-guest/tasks/main.yml
- name: collect facts about installed packages
package_facts:
manager: "apt"
- name: install virtualbox guest additions - name: install virtualbox guest additions
block: block:
- name: install packages - name: install packages
@ -5519,8 +5524,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 18.04
state: present state: present
name: name:
- dkms - dkms
- virtualbox-guest-x11-hwe - '{{ "virtualbox-guest-x11-hwe" if "xserver-xorg-hwe-18.04" in ansible_facts.packages else "virtualbox-guest-x11" }}'
- virtualbox-guest-dkms-hwe - '{{ "virtualbox-guest-dkms-hwe" if "linux-generic-hwe-18.04" in ansible_facts.packages else "virtualbox-guest-dkms" }}'
# TODO: set xineliboutput as frontend # TODO: set xineliboutput as frontend
when: when:

View File

@ -13,3 +13,4 @@
when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest")
# ubuntu-drivers-common tries to autoinstall # ubuntu-drivers-common tries to autoinstall
# conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :( # conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :(
# also alternates between virtualbox-guest-dkms and virtualbox-guest-dkms-hwe on successive runs

View File

@ -1,6 +1,10 @@
--- ---
# file roles/autoinstall-virtualbox-guest/tasks/main.yml # file roles/autoinstall-virtualbox-guest/tasks/main.yml
- name: collect facts about installed packages
package_facts:
manager: "apt"
- name: install virtualbox guest additions - name: install virtualbox guest additions
block: block:
- name: install packages - name: install packages
@ -8,8 +12,8 @@
state: present state: present
name: name:
- dkms - dkms
- virtualbox-guest-x11-hwe - '{{ "virtualbox-guest-x11-hwe" if "xserver-xorg-hwe-18.04" in ansible_facts.packages else "virtualbox-guest-x11" }}'
- virtualbox-guest-dkms-hwe - '{{ "virtualbox-guest-dkms-hwe" if "linux-generic-hwe-18.04" in ansible_facts.packages else "virtualbox-guest-dkms" }}'
# TODO: set xineliboutput as frontend # TODO: set xineliboutput as frontend
when: when: