From c630af67cdf09966414ce50a40b5e20959e21694 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <KrisPublicEmail@gmail.com>
Date: Thu, 9 Jul 2020 21:54:15 -0400
Subject: [PATCH] Move ansible role into base role

---
 dev/dockerbox.yml                             |  1 -
 dev/hypervisor.yml                            |  1 -
 dev/moxie.yml                                 |  1 -
 dev/nextcloud.yml                             |  1 -
 dockerbox.yml                                 |  1 -
 hypervisor.yml                                |  1 -
 moxie.yml                                     |  1 -
 .../tasks/main.yml => base/tasks/ansible.yml} | 12 +++----
 roles/base/tasks/main.yml                     | 31 +++++--------------
 roles/base/tasks/network.yml                  | 19 ++++++++++++
 roles/base/tasks/system.yml                   |  4 +++
 11 files changed, 35 insertions(+), 38 deletions(-)
 rename roles/{ansible/tasks/main.yml => base/tasks/ansible.yml} (57%)
 create mode 100644 roles/base/tasks/network.yml
 create mode 100644 roles/base/tasks/system.yml

diff --git a/dev/dockerbox.yml b/dev/dockerbox.yml
index 88d8969..a1996c9 100644
--- a/dev/dockerbox.yml
+++ b/dev/dockerbox.yml
@@ -4,7 +4,6 @@
   vars_files:
     - host_vars/dockerbox.yml
   roles:
-    - ansible
     - base
     - docker
     - jenkins
diff --git a/dev/hypervisor.yml b/dev/hypervisor.yml
index 6886a2e..fb52baf 100644
--- a/dev/hypervisor.yml
+++ b/dev/hypervisor.yml
@@ -4,6 +4,5 @@
   vars_files:
     - host_vars/hypervisor.yml
   roles:
-    - ansible
     - base
     - libvirt
diff --git a/dev/moxie.yml b/dev/moxie.yml
index fd7082e..fd68ea2 100644
--- a/dev/moxie.yml
+++ b/dev/moxie.yml
@@ -4,6 +4,5 @@
   vars_files:
     - host_vars/moxie.yml
   roles:
-    - ansible
     - docker
     - bitwarden
diff --git a/dev/nextcloud.yml b/dev/nextcloud.yml
index b90d333..fd518ad 100644
--- a/dev/nextcloud.yml
+++ b/dev/nextcloud.yml
@@ -4,7 +4,6 @@
   vars_files:
     - host_vars/nextcloud.yml
   roles:
-    - ansible
     - base
     - docker
     - nextcloud
diff --git a/dockerbox.yml b/dockerbox.yml
index 3e59b9b..8034611 100644
--- a/dockerbox.yml
+++ b/dockerbox.yml
@@ -16,7 +16,6 @@
   hosts: dockerhosts
   become: true
   roles:
-    - ansible
     - base
     - docker
     - jenkins
diff --git a/hypervisor.yml b/hypervisor.yml
index dd73f67..de8db6d 100644
--- a/hypervisor.yml
+++ b/hypervisor.yml
@@ -16,6 +16,5 @@
   hosts: hypervisors
   become: true
   roles:
-    - ansible
     - base
     - libvirt
diff --git a/moxie.yml b/moxie.yml
index fe82cbb..48e28fd 100644
--- a/moxie.yml
+++ b/moxie.yml
@@ -16,7 +16,6 @@
   hosts: moxiehosts
   become: true
   roles:
-    - ansible
     - docker
     - traefik
     - wordpress
diff --git a/roles/ansible/tasks/main.yml b/roles/base/tasks/ansible.yml
similarity index 57%
rename from roles/ansible/tasks/main.yml
rename to roles/base/tasks/ansible.yml
index cbb7406..b1c43f3 100644
--- a/roles/ansible/tasks/main.yml
+++ b/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
-
-- name: 'Install Ansible dependency: python3-docker'
-  apt:
-    name: python3-docker
-    state: present
+  loop:
+    - aptitude
+    - python3-docker
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 0641459..fe95f15 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -1,26 +1,9 @@
-- name: Install useful software
-  apt:
-    name: ["vim", "wget"]
-    state: present
+- import_tasks: ansible.yml
+  tags: ansible
 
-- name: Install network interfaces file
-  copy:
-    src: network-interfaces.cfg
-    dest: /etc/network/interfaces
-    owner: root
-    group: root
-    mode: '0644'
+- import_tasks: system.yml
+  tags: system
+
+- import_tasks: network.yml
+  tags: network
   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
diff --git a/roles/base/tasks/network.yml b/roles/base/tasks/network.yml
new file mode 100644
index 0000000..7cfe65e
--- /dev/null
+++ b/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"
diff --git a/roles/base/tasks/system.yml b/roles/base/tasks/system.yml
new file mode 100644
index 0000000..dee5cec
--- /dev/null
+++ b/roles/base/tasks/system.yml
@@ -0,0 +1,4 @@
+- name: Install useful software
+  apt:
+    name: ["vim", "wget"]
+    state: present