From 0f9ae148a4a8b8e3d2e6d12c9a3eb264c1f60b4f Mon Sep 17 00:00:00 2001
From: Patrick Toal <ptoal@takeflight.ca>
Date: Tue, 10 Mar 2020 13:04:09 -0400
Subject: [PATCH] Splitting up the site file

---
 gitea.yml     | 41 ++++++++++++++++++++++++++++++
 minecraft.yml | 17 +++++++++++++
 site.yml      | 70 ++++-----------------------------------------------
 3 files changed, 63 insertions(+), 65 deletions(-)
 create mode 100644 gitea.yml
 create mode 100644 minecraft.yml

diff --git a/gitea.yml b/gitea.yml
new file mode 100644
index 0000000..739a35a
--- /dev/null
+++ b/gitea.yml
@@ -0,0 +1,41 @@
+- name: Ensure Gitea is running on Zenyatta
+  become: yes
+  hosts: zenyatta.lab.toal.ca
+  vars:
+    container_state: running
+    container_name: gitea
+    container_image: gitea/gitea:latest
+    gitea_nfs_mountpoint: /mnt/gitea
+    gitea_nfs_src: nas.lab.toal.ca:/mnt/BIGPOOL/BackedUp/git
+    gitea_dir_owner: ptoal
+    gitea_dir_group: ptoal
+    container_run_args: >-
+      --rm
+      -p 3000:3000/tcp -p 3222:22/tcp
+      -v "{{ gitea_nfs_mountpoint }}:/data"
+      --hostname=gitea.mgmt.toal.ca
+      --memory=1024M
+    container_firewall_ports:
+      - 3000/tcp
+      - 3222/tcp
+
+  tasks:
+  - name: Ensure container data mount points
+    tags: mount
+    file:
+      path: "{{ gitea_nfs_mountpoint }}"
+      state: directory
+
+  - name: ensure container NFS mounts from NAS
+    tags: [ mount, nfs ]
+    mount:
+      src: "{{ gitea_nfs_src }}"
+      path: "{{ gitea_nfs_mountpoint }}"
+      fstype: nfs
+      opts: rw,rsize=8192,wsize=8192,timeo=14,intr,vers=3
+      state: mounted
+
+  - name: ensure container state
+    tags: container
+    import_role:
+      name: ikke_t.podman_container_systemd
\ No newline at end of file
diff --git a/minecraft.yml b/minecraft.yml
new file mode 100644
index 0000000..17be3cb
--- /dev/null
+++ b/minecraft.yml
@@ -0,0 +1,17 @@
+- name: Minecraft Systems - MineOS
+  hosts: tag_mc_mineos:&tag_ansible
+  become: true
+  vars:
+    nodejs_version: "8.x"
+    mineos_repo: "https://github.com/sage905/mineos-node.git"
+    mineos_version: "pam_auth"
+  roles:
+    - ansible-role-nodejs
+    - sage905.mineos
+
+- name: Minecraft Systems - Mark2
+  hosts: tag_mc_mark2:&tag_ansible
+  become: true
+  roles:
+    - sage905.mark2
+    - sage905.waterfall
diff --git a/site.yml b/site.yml
index 9d84f04..28ab8b8 100644
--- a/site.yml
+++ b/site.yml
@@ -12,7 +12,7 @@
     - name: Set network os type for Cisco
       set_fact: ansible_network_os="ios"
       when: "'Cisco IOS' in platforms"
-   
+
 - name: Configure infrastructure
   hosts: switch01
   become_method: enable
@@ -22,68 +22,8 @@
   roles:
     - toallab.infrastructure
 
-- name: Ansible Red Demo Environment
-  hosts: ansible_red
-  become: false
-  roles:
-    - lightbulb-ansiblered-deck  
+- name: Include Minecraft tasks
+  include_tasks: minecraft.yml
 
-- name: Minecraft Systems - MineOS
-  hosts: tag_mc_mineos:&tag_ansible
-  become: true
-  vars:
-    nodejs_version: "8.x"
-    mineos_repo: "https://github.com/sage905/mineos-node.git"
-    mineos_version: "pam_auth"
-  roles:
-    - ansible-role-nodejs
-    - sage905.mineos
-
-- name: Minecraft Systems - Mark2
-  hosts: tag_mc_mark2:&tag_ansible
-  become: true
-  roles:
-    - sage905.mark2
-    - sage905.waterfall
-
-- name: Ensure Gitea is running on Zenyatta
-  become: yes
-  hosts: zenyatta.lab.toal.ca
-  vars:
-    container_state: running
-    container_name: gitea
-    container_image: gitea/gitea:latest
-    gitea_nfs_mountpoint: /mnt/gitea
-    gitea_nfs_src: nas.lab.toal.ca:/mnt/BIGPOOL/BackedUp/git
-    gitea_dir_owner: ptoal
-    gitea_dir_group: ptoal
-    container_run_args: >-
-      --rm
-      -p 3000:3000/tcp -p 3222:22/tcp
-      -v "{{ gitea_nfs_mountpoint }}:/data"
-      --hostname=gitea.mgmt.toal.ca
-      --memory=1024M
-    container_firewall_ports:
-      - 3000/tcp
-      - 3222/tcp
-  
-  tasks:
-  - name: Ensure container data mount points
-    tags: mount
-    file:
-      path: "{{ gitea_nfs_mountpoint }}"
-      state: directory
-
-  - name: ensure container NFS mounts from NAS
-    tags: [ mount, nfs ]
-    mount:
-      src: "{{ gitea_nfs_src }}"
-      path: "{{ gitea_nfs_mountpoint }}"
-      fstype: nfs
-      opts: rw,rsize=8192,wsize=8192,timeo=14,intr,vers=3
-      state: mounted
-
-  - name: ensure container state
-    tags: container
-    import_role:
-      name: ikke_t.podman_container_systemd
\ No newline at end of file
+- name: Include Gitea tasks
+  include_tasks: gitea.yml