Merge pull request #1081 from holta/openvpn2

Cleanup of /opt/iiab/iiab/install-support, iiab-support.yml etc

iiab-base.yml

@@ -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'] }

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'] }

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'] }

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'] }

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

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'] }