Move ansible role into base role

dev/dockerbox.yml

@@ -4,7 +4,6 @@
   vars_files:
     - host_vars/dockerbox.yml
   roles:
-    - ansible
     - base
     - docker
     - jenkins

dev/hypervisor.yml

@@ -4,6 +4,5 @@
   vars_files:
     - host_vars/hypervisor.yml
   roles:
-    - ansible
     - base
     - libvirt

dev/moxie.yml

@@ -4,6 +4,5 @@
   vars_files:
     - host_vars/moxie.yml
   roles:
-    - ansible
     - docker
     - bitwarden

dev/nextcloud.yml

@@ -4,7 +4,6 @@
   vars_files:
     - host_vars/nextcloud.yml
   roles:
-    - ansible
     - base
     - docker
     - nextcloud

dockerbox.yml

@@ -16,7 +16,6 @@
   hosts: dockerhosts
   become: true
   roles:
-    - ansible
     - base
     - docker
     - jenkins

hypervisor.yml

@@ -16,6 +16,5 @@
   hosts: hypervisors
   become: true
   roles:
-    - ansible
     - base
     - libvirt

moxie.yml

@@ -16,7 +16,6 @@
   hosts: moxiehosts
   become: true
   roles:
-    - ansible
     - docker
     - traefik
     - wordpress

roles/base/tasks/ansible.yml

@@ -4,13 +4,11 @@
     creates: /usr/lib/python3/dist-packages/apt
     warn: false
 
-- name: 'Install Ansible dependency: aptitude'
+- name: Install additional Ansible dependencies
   apt:
-    name: 'aptitude'
+    name: "{{ item }}"
     state: present
     force_apt_get: true
-
+  loop:
-- name: 'Install Ansible dependency: python3-docker'
+    - aptitude
-  apt:
+    - python3-docker
-    name: python3-docker
-    state: present

roles/base/tasks/main.yml

@@ -1,26 +1,9 @@
-- name: Install useful software
+- import_tasks: ansible.yml
-  apt:
+  tags: ansible
-    name: ["vim", "wget"]
-    state: present
 
-- name: Install network interfaces file
+- import_tasks: system.yml
-  copy:
+  tags: system
-    src: network-interfaces.cfg
+
-    dest: /etc/network/interfaces
+- import_tasks: network.yml
-    owner: root
+  tags: network
-    group: root
-    mode: '0644'
   when: manage_network
-
-- name: Install network interfaces
-  template:
-    src: "{{ network_type }}-interface.cfg"
-    dest: "/etc/network/interfaces.d/{{ ip_inter }}"
-  notify: reboot_host
-  when: manage_network
-
-- name: Install bridge utilities
-  apt:
-    name: bridge-utils
-    state: present
-  when: network_type == "bridged" and manage_network

roles/base/tasks/network.yml

@@ -0,0 +1,19 @@
+- name: Install network interfaces file
+  copy:
+    src: network-interfaces.cfg
+    dest: /etc/network/interfaces
+    owner: root
+    group: root
+    mode: '0644'
+
+- name: Install network interfaces
+  template:
+    src: "{{ network_type }}-interface.cfg"
+    dest: "/etc/network/interfaces.d/{{ ip_inter }}"
+  notify: reboot_host
+
+- name: Install bridge utilities
+  apt:
+    name: bridge-utils
+    state: present
+  when: network_type == "bridged"

roles/base/tasks/system.yml

@@ -0,0 +1,4 @@
+- name: Install useful software
+  apt:
+    name: ["vim", "wget"]
+    state: present