From 2aa97c7c39327f324d96dfd4538a3fe1ee136c21 Mon Sep 17 00:00:00 2001 From: LaurentMarchelli Date: Tue, 1 Oct 2019 16:17:50 +0200 Subject: [PATCH 1/3] Simplify output with include_tasks instead than include. - docker - vagrant - virtualbox --- roles/docker/tasks/main.yml | 15 ++++++++++----- roles/vagrant/tasks/main.yml | 15 ++++++++++----- roles/virtualbox/tasks/main.yml | 18 ++++++++++++------ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 42ffad5..5bc41c0 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,17 +1,22 @@ --- # tasks file for docker -- include: install_CentOS.yml +- name: 'CentOS' + include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 -- include: install_Fedora.yml +- name: 'Fedora' + include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 -- include: install_Ubuntu.yml +- name: 'Ubuntu' + include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" -- include: install_Debian.yml +- name: 'Debian' + include_tasks: install_Debian.yml when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 -- include: configure.yml +- name: 'Configure' + include_tasks: configure.yml when: ansible_facts['distribution'] != 'RedHat' diff --git a/roles/vagrant/tasks/main.yml b/roles/vagrant/tasks/main.yml index 27afd9d..ca2dd98 100644 --- a/roles/vagrant/tasks/main.yml +++ b/roles/vagrant/tasks/main.yml @@ -1,17 +1,22 @@ --- # tasks file for vagrant -- include: install_CentOS.yml +- name: 'CentOS' + include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 -- include: install_RedHat.yml +- name: 'RedHat' + include_tasks: install_RedHat.yml when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 -- include: install_Fedora.yml +- name: 'Fedora' + include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 -- include: install_Ubuntu.yml +- name: 'Ubuntu' + include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" -- include: install_Debian.yml +- name: 'Debian' + include_tasks: install_Debian.yml when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 diff --git a/roles/virtualbox/tasks/main.yml b/roles/virtualbox/tasks/main.yml index 1cef15c..5d3974f 100644 --- a/roles/virtualbox/tasks/main.yml +++ b/roles/virtualbox/tasks/main.yml @@ -1,22 +1,28 @@ --- # tasks file for virtualbox -- include: install_CentOS.yml +- name: 'CentOS' + include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 -- include: install_RedHat.yml +- name: 'RedHat' + include_tasks: install_RedHat.yml when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 -- include: install_Fedora.yml +- name: 'Fedora' + include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 -- include: install_Ubuntu.yml +- name: 'Ubuntu' + include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" -- include: install_Debian.yml +- name: 'Debian' + include_tasks: install_Debian.yml when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 - include: configure.yml -- include: extensions.yml +- name: 'Extension Pack' + include_tasks: extensions.yml when: install_extpacks From 0f47ad5933f27e747953abd9aa92710ed4c95d8e Mon Sep 17 00:00:00 2001 From: LaurentMarchelli Date: Tue, 1 Oct 2019 16:24:49 +0200 Subject: [PATCH 2/3] Organize distribution in alphabetical order - docker - vagrant - virtualbox --- roles/docker/tasks/main.yml | 8 ++++---- roles/vagrant/tasks/main.yml | 14 +++++++------- roles/virtualbox/tasks/main.yml | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 5bc41c0..8e48656 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -5,6 +5,10 @@ include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 +- name: 'Debian' + include_tasks: install_Debian.yml + when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 + - name: 'Fedora' include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 @@ -13,10 +17,6 @@ include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" -- name: 'Debian' - include_tasks: install_Debian.yml - when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 - - name: 'Configure' include_tasks: configure.yml when: ansible_facts['distribution'] != 'RedHat' diff --git a/roles/vagrant/tasks/main.yml b/roles/vagrant/tasks/main.yml index ca2dd98..a2470da 100644 --- a/roles/vagrant/tasks/main.yml +++ b/roles/vagrant/tasks/main.yml @@ -5,18 +5,18 @@ include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 -- name: 'RedHat' - include_tasks: install_RedHat.yml - when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 +- name: 'Debian' + include_tasks: install_Debian.yml + when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 - name: 'Fedora' include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 +- name: 'RedHat' + include_tasks: install_RedHat.yml + when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 + - name: 'Ubuntu' include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" - -- name: 'Debian' - include_tasks: install_Debian.yml - when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 diff --git a/roles/virtualbox/tasks/main.yml b/roles/virtualbox/tasks/main.yml index 5d3974f..f8a1c95 100644 --- a/roles/virtualbox/tasks/main.yml +++ b/roles/virtualbox/tasks/main.yml @@ -5,22 +5,22 @@ include_tasks: install_CentOS.yml when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7 -- name: 'RedHat' - include_tasks: install_RedHat.yml - when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 +- name: 'Debian' + include_tasks: install_Debian.yml + when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 - name: 'Fedora' include_tasks: install_Fedora.yml when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30 +- name: 'RedHat' + include_tasks: install_RedHat.yml + when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_version']|int <= 8 + - name: 'Ubuntu' include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" -- name: 'Debian' - include_tasks: install_Debian.yml - when: ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_version']|int >= 10 - - include: configure.yml - name: 'Extension Pack' From 208acd71b86114fa24a596be1b37fdf2d9b14cac Mon Sep 17 00:00:00 2001 From: LaurentMarchelli Date: Tue, 1 Oct 2019 17:32:51 +0200 Subject: [PATCH 3/3] Keep tasks grouped per distribution - include_tasks configure.yml changed into import_tasks configure.yml - import_tasks configure.yml moved into install_*.yml - include_tasks extensions.yml moved into install_*.yml - Typo fixed - docker - vagrant - virtualbox --- roles/docker/tasks/install_CentOS.yml | 2 ++ roles/docker/tasks/install_Debian.yml | 6 ++++-- roles/docker/tasks/install_Fedora.yml | 2 ++ roles/docker/tasks/install_Ubuntu.yml | 6 ++++-- roles/docker/tasks/main.yml | 4 ---- roles/vagrant/tasks/install_Debian.yml | 2 +- roles/vagrant/tasks/install_Fedora.yml | 2 +- roles/vagrant/tasks/install_RedHat.yml | 2 +- roles/vagrant/tasks/install_Ubuntu.yml | 2 +- roles/virtualbox/tasks/configure.yml | 6 +++--- roles/virtualbox/tasks/extensions.yml | 6 +++--- roles/virtualbox/tasks/install_CentOS.yml | 14 ++++++++++---- roles/virtualbox/tasks/install_Debian.yml | 14 ++++++++++---- roles/virtualbox/tasks/install_Fedora.yml | 12 +++++++++--- roles/virtualbox/tasks/install_RedHat.yml | 15 +++++++++++---- roles/virtualbox/tasks/install_Ubuntu.yml | 14 ++++++++++---- roles/virtualbox/tasks/main.yml | 6 ------ 17 files changed, 72 insertions(+), 43 deletions(-) diff --git a/roles/docker/tasks/install_CentOS.yml b/roles/docker/tasks/install_CentOS.yml index bafb00e..7f1af5d 100644 --- a/roles/docker/tasks/install_CentOS.yml +++ b/roles/docker/tasks/install_CentOS.yml @@ -23,3 +23,5 @@ name: docker-ce, docker-ce-cli, containerd.io state: present become: yes + +- import_tasks: configure.yml diff --git a/roles/docker/tasks/install_Debian.yml b/roles/docker/tasks/install_Debian.yml index 3305375..1b1cac3 100644 --- a/roles/docker/tasks/install_Debian.yml +++ b/roles/docker/tasks/install_Debian.yml @@ -7,7 +7,7 @@ state: absent become: yes -- name: add Docker apt signing key +- name: Add Docker apt signing key apt_key: url: "{{ item }}" state: present @@ -15,7 +15,7 @@ - https://download.docker.com/linux/debian/gpg become: yes -- name: setup Docker apt repository on Debian +- name: Setup Docker apt repository on Debian apt_repository: repo: "deb [arch=amd64] https://download.docker.com/linux/debian buster stable" state: present @@ -34,3 +34,5 @@ name: "{{ debian_docker_packages }}" state: present become: yes + +- import_tasks: configure.yml diff --git a/roles/docker/tasks/install_Fedora.yml b/roles/docker/tasks/install_Fedora.yml index b3abe6c..be345fa 100644 --- a/roles/docker/tasks/install_Fedora.yml +++ b/roles/docker/tasks/install_Fedora.yml @@ -23,3 +23,5 @@ name: docker-ce, docker-ce-cli, containerd.io state: present become: yes + +- import_tasks: configure.yml diff --git a/roles/docker/tasks/install_Ubuntu.yml b/roles/docker/tasks/install_Ubuntu.yml index 6a8c0d3..ceecd01 100644 --- a/roles/docker/tasks/install_Ubuntu.yml +++ b/roles/docker/tasks/install_Ubuntu.yml @@ -7,7 +7,7 @@ state: absent become: yes -- name: add Docker apt signing key +- name: Add Docker apt signing key apt_key: url: "{{ item }}" state: present @@ -15,7 +15,7 @@ - https://download.docker.com/linux/ubuntu/gpg become: yes -- name: setup Docker apt repository on Ubuntu +- name: Setup Docker apt repository on Ubuntu apt_repository: repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable" state: present @@ -34,3 +34,5 @@ name: "{{ ubuntu_docker_packages }}" state: present become: yes + +- import_tasks: configure.yml diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 8e48656..869ae77 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -16,7 +16,3 @@ - name: 'Ubuntu' include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" - -- name: 'Configure' - include_tasks: configure.yml - when: ansible_facts['distribution'] != 'RedHat' diff --git a/roles/vagrant/tasks/install_Debian.yml b/roles/vagrant/tasks/install_Debian.yml index eda9d0d..1f634e9 100644 --- a/roles/vagrant/tasks/install_Debian.yml +++ b/roles/vagrant/tasks/install_Debian.yml @@ -1,7 +1,7 @@ --- # Install vagrant on Debian -- name: install Debian packages +- name: Install Debian packages apt: deb: "{{ item }}" loop: "{{ debian_packages }}" diff --git a/roles/vagrant/tasks/install_Fedora.yml b/roles/vagrant/tasks/install_Fedora.yml index ee510d8..4552c63 100644 --- a/roles/vagrant/tasks/install_Fedora.yml +++ b/roles/vagrant/tasks/install_Fedora.yml @@ -1,7 +1,7 @@ --- # Install vagrant on Fedora -- name: install Fedora packages +- name: Install Fedora packages package: name: "{{ fedora_packages }}" state: present diff --git a/roles/vagrant/tasks/install_RedHat.yml b/roles/vagrant/tasks/install_RedHat.yml index 83803e4..cb3bfd4 100644 --- a/roles/vagrant/tasks/install_RedHat.yml +++ b/roles/vagrant/tasks/install_RedHat.yml @@ -1,7 +1,7 @@ --- # Install vagrant on RedHat -- name: install RedHat packages +- name: Install RedHat packages package: name: "{{ redhat_packages }}" state: present diff --git a/roles/vagrant/tasks/install_Ubuntu.yml b/roles/vagrant/tasks/install_Ubuntu.yml index 7cbbe88..c62fe9d 100644 --- a/roles/vagrant/tasks/install_Ubuntu.yml +++ b/roles/vagrant/tasks/install_Ubuntu.yml @@ -1,7 +1,7 @@ --- # Install vagrant on Ubuntu -- name: install Ubuntu packages +- name: Install Ubuntu packages apt: deb: "{{ item }}" loop: "{{ ubuntu_packages }}" diff --git a/roles/virtualbox/tasks/configure.yml b/roles/virtualbox/tasks/configure.yml index 1722a75..054f6a7 100644 --- a/roles/virtualbox/tasks/configure.yml +++ b/roles/virtualbox/tasks/configure.yml @@ -1,17 +1,17 @@ --- # configure task for virtualbox -- name: check kernel module status +- name: Check kernel module status command: /usr/lib/virtualbox/vboxdrv.sh status register: vboxdrv_status changed_when: False -- name: rebuild kernel modules +- name: Rebuild kernel modules command: /usr/lib/virtualbox/vboxdrv.sh setup when: "'is loaded' not in vboxdrv_status.stdout" become: yes -- name: setup VirtualBox user +- name: Setup VirtualBox user user: name: "{{ item }}" groups: vboxusers diff --git a/roles/virtualbox/tasks/extensions.yml b/roles/virtualbox/tasks/extensions.yml index 041d375..9532be2 100644 --- a/roles/virtualbox/tasks/extensions.yml +++ b/roles/virtualbox/tasks/extensions.yml @@ -5,7 +5,7 @@ state: directory mode: '0777' -- name: download extpack +- name: Download extpack get_url: dest: /tmp/vbox-extpacks/ url: "{{ item }}" @@ -20,7 +20,7 @@ # var: item.path # with_items: "{{ extpacks.files }}" -- name: check installed extpacks +- name: Check installed extpacks shell: | set -o pipefail vboxmanage list extpacks | grep Usable @@ -30,7 +30,7 @@ ignore_errors: yes changed_when: False -- name: install extpacks +- name: Install extpacks command: VBoxManage extpack install --replace "{{ item.path }}" --accept-license=56be48f923303c8cababb0bb4c478284b688ed23f16d775d729b89a2e8e5f9eb with_items: "{{ extpacks.files }}" when: "'false' not in extpack_installed.stdout" diff --git a/roles/virtualbox/tasks/install_CentOS.yml b/roles/virtualbox/tasks/install_CentOS.yml index 23c71ac..74ed6ca 100644 --- a/roles/virtualbox/tasks/install_CentOS.yml +++ b/roles/virtualbox/tasks/install_CentOS.yml @@ -1,7 +1,7 @@ --- # Install VirtualBox on CentOS -- name: setup VirtualBox yum repository on CentOS 7 +- name: Setup VirtualBox yum repository on CentOS 7 yum_repository: name: virtualbox description: Oracle Linux / RHEL / CentOS-$releasever / $basearch - VirtualBox @@ -13,21 +13,27 @@ when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version']|int == 7 become: yes -- name: enable epel repository +- name: Enable epel repository yum: name: epel-release state: present become: yes -- name: install VirtualBox +- name: Install VirtualBox yum: name: "VirtualBox-{{ virtualbox_version }}.{{ ansible_architecture }}" state: present become: yes -- name: install VirtualBox vboxdrv requirements on CentOS 7 +- name: Install VirtualBox vboxdrv requirements on CentOS 7 yum: name: "{{ vboxdrv_required_packages_centos_7 }}" state: present when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version']|int == 7 become: yes + +- import_tasks: configure.yml + +- name: 'Extension Pack' + include_tasks: extensions.yml + when: install_extpacks diff --git a/roles/virtualbox/tasks/install_Debian.yml b/roles/virtualbox/tasks/install_Debian.yml index 5e2d27a..2c576a4 100644 --- a/roles/virtualbox/tasks/install_Debian.yml +++ b/roles/virtualbox/tasks/install_Debian.yml @@ -8,7 +8,7 @@ state: present become: yes -- name: add Virtualbox apt signing key +- name: Add Virtualbox apt signing key apt_key: url: "{{ item }}" state: present @@ -17,22 +17,28 @@ - https://www.virtualbox.org/download/oracle_vbox.asc become: yes -- name: setup VirtualBox apt repository on Debian +- name: Setup VirtualBox apt repository on Debian apt_repository: repo: "deb https://download.virtualbox.org/virtualbox/debian buster contrib" state: present become: yes -- name: install VirtualBox +- name: Install VirtualBox apt: update_cache: yes name: "virtualbox-{{ virtualbox_version }}" state: present become: yes -- name: install VirtualBox vboxdrv requirements on Debian +- name: Install VirtualBox vboxdrv requirements on Debian apt: name: "{{ vboxdrv_required_packages_debian_10 }}" state: present when: ansible_facts['distribution'] == "Debian" become: yes + +- import_tasks: configure.yml + +- name: 'Extension Pack' + include_tasks: extensions.yml + when: install_extpacks diff --git a/roles/virtualbox/tasks/install_Fedora.yml b/roles/virtualbox/tasks/install_Fedora.yml index 2822bc4..a48941d 100644 --- a/roles/virtualbox/tasks/install_Fedora.yml +++ b/roles/virtualbox/tasks/install_Fedora.yml @@ -1,7 +1,7 @@ --- # Install VirtualBox on Fedora -- name: setup VirtualBox yum repository on Fedora 30 +- name: Setup VirtualBox yum repository on Fedora 30 yum_repository: name: virtualbox description: Fedora $releasever - $basearch - VirtualBox @@ -13,15 +13,21 @@ when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_major_version']|int >= 30 become: yes -- name: install VirtualBox +- name: Install VirtualBox yum: name: "VirtualBox-{{ virtualbox_version }}.{{ ansible_architecture }}" state: present become: yes -- name: install VirtualBox vboxdrv requirements on Fedora +- name: Install VirtualBox vboxdrv requirements on Fedora yum: name: "{{ vboxdrv_required_packages_fedora_30 }}" state: present when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_major_version']|int >= 30 become: yes + +- import_tasks: configure.yml + +- name: 'Extension Pack' + include_tasks: extensions.yml + when: install_extpacks diff --git a/roles/virtualbox/tasks/install_RedHat.yml b/roles/virtualbox/tasks/install_RedHat.yml index 90bdc7e..645527b 100644 --- a/roles/virtualbox/tasks/install_RedHat.yml +++ b/roles/virtualbox/tasks/install_RedHat.yml @@ -1,7 +1,7 @@ --- # Install VirtualBox on RedHat -- name: setup VirtualBox yum repository on RHEL <= 7 +- name: Setup VirtualBox yum repository on RHEL <= 7 yum_repository: name: virtualbox description: Oracle Linux / RHEL / CentOS-$releasever / $basearch - VirtualBox @@ -14,7 +14,7 @@ become: yes # Temporary fix, for RHEL 8 (currently, distribution is not available) -- name: setup VirtualBox yum repository on RHEL 8 (using Fedora 29 repo) +- name: Setup VirtualBox yum repository on RHEL 8 (using Fedora 29 repo) yum_repository: name: virtualbox description: Fedora $releasever - $basearch - VirtualBox @@ -26,15 +26,22 @@ when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_major_version']|int == 8 become: yes -- name: install VirtualBox +- name: Install VirtualBox package: name: "VirtualBox-{{ virtualbox_version }}.{{ ansible_architecture }}" state: present become: yes -- name: install VirtualBox vboxdrv requirements on RHEL +- name: Install VirtualBox vboxdrv requirements on RHEL package: name: "{{ vboxdrv_required_packages_rhel_8 }}" state: present when: ansible_facts['distribution'] == "RedHat" and ansible_facts['distribution_major_version']|int == 8 become: yes + +- import_tasks: configure.yml +- import_tasks: configure.yml + +- name: 'Extension Pack' + include_tasks: extensions.yml + when: install_extpacks diff --git a/roles/virtualbox/tasks/install_Ubuntu.yml b/roles/virtualbox/tasks/install_Ubuntu.yml index ba0efb0..ca0a237 100644 --- a/roles/virtualbox/tasks/install_Ubuntu.yml +++ b/roles/virtualbox/tasks/install_Ubuntu.yml @@ -7,7 +7,7 @@ state: present become: yes -- name: add Virtualbox apt signing key +- name: Add Virtualbox apt signing key apt_key: url: "{{ item }}" state: present @@ -16,20 +16,26 @@ - https://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc become: yes -- name: setup VirtualBox apt repository on Ubuntu +- name: Setup VirtualBox apt repository on Ubuntu apt_repository: repo: "deb https://download.virtualbox.org/virtualbox/debian bionic contrib" state: present become: yes -- name: install VirtualBox +- name: Install VirtualBox package: name: "virtualbox-{{ virtualbox_version }}" state: present become: yes -- name: install VirtualBox vboxdrv requirements on Ubuntu +- name: Install VirtualBox vboxdrv requirements on Ubuntu package: name: "{{ vboxdrv_required_packages_ubuntu_1804 }}" state: present become: yes + +- import_tasks: configure.yml + +- name: 'Extension Pack' + include_tasks: extensions.yml + when: install_extpacks diff --git a/roles/virtualbox/tasks/main.yml b/roles/virtualbox/tasks/main.yml index f8a1c95..81cf62b 100644 --- a/roles/virtualbox/tasks/main.yml +++ b/roles/virtualbox/tasks/main.yml @@ -20,9 +20,3 @@ - name: 'Ubuntu' include_tasks: install_Ubuntu.yml when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04" - -- include: configure.yml - -- name: 'Extension Pack' - include_tasks: extensions.yml - when: install_extpacks