From 2877d8f06c9e78ed1be645b5b250cc57ade9bf6f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 30 Oct 2017 21:05:43 -0400
Subject: [PATCH 1/2] roles: -> tasks: for dynamic execution (avoids pages of
 "skipping")

---
 iiab-steps.yml | 80 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/iiab-steps.yml b/iiab-steps.yml
index 66c97721c..ce27ec00c 100644
--- a/iiab-steps.yml
+++ b/iiab-steps.yml
@@ -7,23 +7,63 @@
   - vars/{{ ansible_local.local_facts.os_ver }}.yml
   - vars/local_vars.yml
 
-  roles:
-      - { role: 0-init, tags: ['0-init'] }
-      - { role: 1-prep, tags: ['1-prep','platform','base'],
-          when: ansible_local.local_facts.stage|int < 1 }
-      - { role: 2-common, tags: ['2-common','base'],
-          when: ansible_local.local_facts.stage|int < 2 }
-      - { role: 3-base-server, tags: ['3-base-server','base'],
-          when: ansible_local.local_facts.stage|int < 3 }
-      - { role: 4-server-options, tags: ['4-server-options'],
-          when: ansible_local.local_facts.stage|int < 4 }
-      - { role: 5-xo-services, tags: ['5-xo-services'],
-          when: ansible_local.local_facts.stage|int < 5 }
-      - { role: 6-generic-apps, tags: ['6-generic-apps'],
-          when: ansible_local.local_facts.stage|int < 6 }
-      - { role: 7-edu-apps, tags: ['7-edu-apps'],
-          when: ansible_local.local_facts.stage|int < 7 }
-      - { role: 8-mgmt-tools, tags: ['8-mgmt-tools'],
-          when: ansible_local.local_facts.stage|int < 8 }
-      - { role: 9-local-addons, tags: ['9-local-addons'],
-          when: ansible_local.local_facts.stage|int < 9 }
+  tasks:
+
+  - name: 0-init
+    include_role:
+      name: 0-init
+    tags: 0-init
+
+  - name: 1-prep
+    include_role:
+      name: 1-prep
+    when: ansible_local.local_facts.stage|int < 1
+    tags: 1-prep, platform, base
+
+  - name: 2-common
+    include_role:
+      name: 2-common
+    when: ansible_local.local_facts.stage|int < 2
+    tags: 2-common, base
+
+  - name: 3-base-server
+    include_role:
+      name: 3-base-server
+    when: ansible_local.local_facts.stage|int < 3
+    tags: 3-base-server, base
+
+  - name: 4-server-options
+    include_role:
+      name: 4-server-options
+    when: ansible_local.local_facts.stage|int < 4
+    tags: 4-server-options
+
+  - name: 5-xo-services
+    include_role:
+      name: 5-xo-services
+    when: ansible_local.local_facts.stage|int < 5
+    tags: 5-xo-services
+
+  - name: 6-generic-apps
+    include_role:
+      name: 6-generic-apps
+    when: ansible_local.local_facts.stage|int < 6
+    tags: 6-generic-apps
+
+  - name: 7-edu-apps
+    include_role:
+      name: 7-edu-apps
+    when: ansible_local.local_facts.stage|int < 7
+    tags: 7-edu-apps
+
+  - name: 8-mgmt-tools
+    include_role:
+      name: 8-mgmt-tools
+    when: ansible_local.local_facts.stage|int < 8
+    tags: 8-mgmt-tools
+
+  - name: 9-local-addons
+    include_role:
+      name: 9-local-addons
+    when: ansible_local.local_facts.stage|int < 9
+    tags: 9-local-addons

From e5aa9652635e7bf6b5ad518a9dd56c528d565091 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 30 Oct 2017 21:58:29 -0400
Subject: [PATCH 2/2] tweak iiab-install's annc of which stage it's continuing
 with

---
 iiab-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iiab-install b/iiab-install
index 52f4575ca..086c86775 100755
--- a/iiab-install
+++ b/iiab-install
@@ -30,7 +30,7 @@ else
             echo "Entering debug mode"
             sed -i -e 's/^STAGE=.*/STAGE=2/' /etc/iiab/iiab.env
         elif [ ! $STAGE == 9 ]; then
-            echo "Restarting from STAGE $STAGE"
+            echo "Restarting *after* STAGE $STAGE (as soon as Stage 0 completes..Stage 9 will be last)"
         else
             # place keeper add read response
             # "offer 'Y' or stage number dialog box option to override"