From c9915b7f3f08cd590636f84f81436fd574ff14f5 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 2 Sep 2018 23:51:28 -0400
Subject: [PATCH 1/5] Update install-support

---
 install-support | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/install-support b/install-support
index b5ae9a12e..24785214a 100755
--- a/install-support
+++ b/install-support
@@ -1,17 +1,15 @@
 #!/bin/bash
 
-PLAYBOOK="iiab-base.yml"
+PLAYBOOK="iiab-support.yml"
 INVENTORY="ansible_hosts"
 CWD=`pwd`
 
 export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
 
-if [ ! -f $PLAYBOOK ]
-then
- echo "IIAB Playbook not found."
- echo "Please run this command from the top level of the git repo."
- echo "Exiting."
- exit 1
+if [ ! -f $PLAYBOOK ]; then
+    echo -e "\nEXITING: $PLAYBOOK not found.\n"
+    echo -e "Please run this command from /opt/iiab/iiab (top of git repo).\n"
+    exit 1
 fi
 
 sed -i -e "s/openvpn_install: False/openvpn_install: True/" /etc/iiab/local_vars.yml

From 7e37b0d380d246efab747814f993e1424ef61efe Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 2 Sep 2018 23:59:19 -0400
Subject: [PATCH 2/5] Update and rename iiab-base.yml to iiab-support.yml

---
 iiab-base.yml    | 13 -------------
 iiab-support.yml | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 iiab-base.yml
 create mode 100644 iiab-support.yml

diff --git a/iiab-base.yml b/iiab-base.yml
deleted file mode 100644
index de2238008..000000000
--- a/iiab-base.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: all
-  become: yes
-
-  vars_files:
-  - vars/default_vars.yml
-  - vars/{{ ansible_local.local_facts.os_ver }}.yml
-  - /etc/iiab/local_vars.yml
-
-  roles:
-      - { role: 0-init, tags: ['0-init'] }
-      - { role: 1-prep, tags: ['1-prep','platform','base'] }
-      - { role: openvpn, tags: ['openvpn'] }
diff --git a/iiab-support.yml b/iiab-support.yml
new file mode 100644
index 000000000..22b48df3c
--- /dev/null
+++ b/iiab-support.yml
@@ -0,0 +1,14 @@
+---
+- hosts: all
+  become: yes
+
+  vars_files:
+  - vars/default_vars.yml
+  - vars/{{ ansible_local.local_facts.os_ver }}.yml
+  - /etc/iiab/local_vars.yml
+
+  roles:
+    - { role: 0-init, tags: ['0-init'] }
+    #- { role: 1-prep, tags: ['1-prep', 'platform', 'base'] }
+    - { role: 1-prep, tags: ['1-prep'] }
+    - { role: openvpn, tags: ['openvpn'] }

From e8b7c31b14889fa691b6d88d805efbcb04473255 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 3 Sep 2018 00:00:33 -0400
Subject: [PATCH 3/5] Update iiab-from-console.yml

---
 iiab-from-console.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/iiab-from-console.yml b/iiab-from-console.yml
index c6275a641..9756638b9 100644
--- a/iiab-from-console.yml
+++ b/iiab-from-console.yml
@@ -9,11 +9,11 @@
   - /etc/iiab/config_vars.yml
 
   roles:
-      - { role: 0-init, tags: ['0-init'] }
-      - { role: 4-server-options, tags: ['4-server-options'] }
-      - { role: 5-xo-services, tags: ['5-xo-services'] }
-      - { role: 6-generic-apps, tags: ['6-generic-apps'] }
-      - { role: 7-edu-apps, tags: ['7-edu-apps'] }
-      - { role: 8-mgmt-tools, tags: ['8-mgmt-tools'] }
-      - { role: 9-local-addons, tags: ['9-local-addons'] }
-      - { role: network, tags: ['network'] }
+    - { role: 0-init, tags: ['0-init'] }
+    - { role: 4-server-options, tags: ['4-server-options'] }
+    - { role: 5-xo-services, tags: ['5-xo-services'] }
+    - { role: 6-generic-apps, tags: ['6-generic-apps'] }
+    - { role: 7-edu-apps, tags: ['7-edu-apps'] }
+    - { role: 8-mgmt-tools, tags: ['8-mgmt-tools'] }
+    - { role: 9-local-addons, tags: ['9-local-addons'] }
+    - { role: network, tags: ['network'] }

From b35416889932b6a0749a38ed625064f28461688e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 3 Sep 2018 00:00:53 -0400
Subject: [PATCH 4/5] Update iiab-network.yml

---
 iiab-network.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iiab-network.yml b/iiab-network.yml
index 721bedac9..01f594449 100644
--- a/iiab-network.yml
+++ b/iiab-network.yml
@@ -9,5 +9,5 @@
   - /etc/iiab/config_vars.yml
 
   roles:
-      - { role: 0-init, tags: ['network'] }
-      - { role: network, tags: ['network','base'] }
+    - { role: 0-init, tags: ['network'] }
+    - { role: network, tags: ['network','base'] }

From 2fee404ad45f9957089df25a7e88c7d58e41ea8f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 3 Sep 2018 00:01:24 -0400
Subject: [PATCH 5/5] Update run-one-role.yml

---
 run-one-role.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-one-role.yml b/run-one-role.yml
index abd41ff1d..5b0ce5038 100644
--- a/run-one-role.yml
+++ b/run-one-role.yml
@@ -9,5 +9,5 @@
   - /etc/iiab/config_vars.yml
 
   roles:
-      - { role: 0-init, tags: ['0-init'] }
-      - { role: "{{ role_to_run }}", tags: ['run'] }
+    - { role: 0-init, tags: ['0-init'] }
+    - { role: "{{ role_to_run }}", tags: ['run'] }