frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix condition to ubuntu-drivers autoinstall

Browse Source
This commit is contained in:
Alexander Grothe
2017-12-16 18:58:57 +01:00
parent 1f2a51dd37
commit 640d27dfa3
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Manual.org
View File

@@ -3199,12 +3199,10 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
- name: use ubuntu-drivers to install additional drivers automatically - name: use ubuntu-drivers to install additional drivers automatically
command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
when: when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
- ansible_virtualization_type != "virtualbox" ansible_distribution_version != "16.04"
- ansible_virtualization_role != "guest" # ubuntu-drivers-common tries to autoinstall
- ansible_distribution == "Ubuntu" # conflicting packages for virtualbox in Ubuntu 16.04 :(
- ansible_distribution_version != "16.04" # ubuntu-drivers-common tries to autoinstall
# conflicting packages for virtualbox :(
#+END_SRC #+END_SRC
** autoinstall-virtualbox-guest ** autoinstall-virtualbox-guest
This role installs the guest additions for virtualbox guests on Ubuntu 16.04 This role installs the guest additions for virtualbox guests on Ubuntu 16.04

10
roles/autoinstall-ubuntu-drivers/tasks/main.yml
View File

@@ -10,9 +10,7 @@
- name: use ubuntu-drivers to install additional drivers automatically - name: use ubuntu-drivers to install additional drivers automatically
command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
when: when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
- ansible_virtualization_type != "virtualbox" ansible_distribution_version != "16.04"
- ansible_virtualization_role != "guest" # ubuntu-drivers-common tries to autoinstall
- ansible_distribution == "Ubuntu" # conflicting packages for virtualbox in Ubuntu 16.04 :(
- ansible_distribution_version != "16.04" # ubuntu-drivers-common tries to autoinstall
# conflicting packages for virtualbox :(