partial cherry-pick of 0026446a80

roles/1-prep/tasks/main.yml

@@ -1,6 +1,6 @@
 # Preparations (Hardware Level)
 
-- name: ...IS BEGINNING ============================================
+- name: ...IS BEGINNING ==================================
   command: echo
 
 - name: Get the uuidgen program
@@ -89,12 +89,9 @@
   when: first_run and usb_NUC6.stdout|int > 0
 
 # this script can be sourced to get IIAB location
-- name: Create iiab.env file
+- name: Recording STAGE 1 HAS COMPLETED ==================
   template: src=roles/1-prep/templates/iiab.env.j2
             dest=/etc/iiab/iiab.env
             owner=root
             group=root
             mode=0644
-
-- name: ...HAS COMPLETED ===========================================
-  command: echo

roles/2-common/tasks/main.yml

@@ -1,6 +1,6 @@
 # Common OS-Level Additions & Mods (that only need to be performed once)
 
-- name: ...IS BEGINNING ==========================================
+- name: ...IS BEGINNING ==================================
   command: echo
 
 #- include: iiab_ini.yml
@@ -48,11 +48,8 @@
 
 - include: udev.yml
 
-- name: Record STAGE
+- name: Recording STAGE 2 HAS COMPLETED ==================
   lineinfile: dest=/etc/iiab/iiab.env
               regexp='^STAGE=*'
               line='STAGE=2'
               state=present
-
-- name: ...HAS COMPLETED =========================================
-  command: echo

roles/3-base-server/tasks/main.yml

@@ -1,6 +1,5 @@
 # Base Server
-
+- name: ...IS BEGINNING ==================================
-- name: ...IS BEGINNING =====================================
   command: echo
 
 - name: HTTPD
@@ -30,12 +29,9 @@
            state=restarted
   when: not installing
 
-# If we got here we're done
+- name: Record STAGE 3 HAS COMPLETED =====================
-- name: Record STAGE
   lineinfile: dest=/etc/iiab/iiab.env
               regexp='^STAGE=*'
               line='STAGE=3'
               state=present
 
-- name: ...HAS COMPLETED ====================================
-  command: echo

roles/4-server-options/tasks/main.yml

@@ -1,5 +1,4 @@
 # Server Options
-
 - name: ...IS BEGINNING ==================================
   command: echo
 
@@ -57,12 +56,6 @@
   when: usb_lib_install
   tags: usb-lib
 
-- name: Record STAGE
-  lineinfile: dest=/etc/iiab/iiab.env
-              regexp='^STAGE=*'
-              line='STAGE=4'
-              state=present
-
 - name: Put a Python interface to iiab.env
   template: src=roles/1-prep/templates/iiab_env.py.j2
             dest=/etc/iiab/iiab_env.py
@@ -71,5 +64,8 @@
   command: /usr/bin/iiab-refresh-wiki-docs
   when: not nodocs
 
-- name: ...HAS COMPLETED =================================
+- name: Recording STAGE 4 HAS COMPLETED ==================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^STAGE=*'
+              line='STAGE=4'
+              state=present

roles/5-xo-services/tasks/main.yml

@@ -1,6 +1,5 @@
 # XO Services
-
+- name: ...IS BEGINNING ==================================
-- name: ...IS BEGINNING =====================================
   command: echo
 
 - name: ACTIVITY-SERVER
@@ -21,11 +20,8 @@
   when: idmgr_install
   tags: olpc, idmgr
 
-- name: Record STAGE 5
+- name: Recording STAGE 5 HAS COMPLETED ==================
   lineinfile: dest=/etc/iiab/iiab.env
              regexp='^STAGE=*'
               line='STAGE=5'
               state=present
-
-- name: ...HAS COMPLETED ====================================
-  command: echo

roles/6-generic-apps/tasks/main.yml

@@ -1,6 +1,5 @@
 # Generic Apps
-
+- name: ...IS BEGINNING ==================================
-- name: ...IS BEGINNING ====================================
   command: echo
 
 - name: CALIBRE
@@ -45,11 +44,8 @@
   when: wordpress_install
   tags: wordpress
 
-- name: Record STAGE 6
+- name: Recording STAGE 6 HAS COMPLETED ==================
   lineinfile: dest=/etc/iiab/iiab.env
              regexp='^STAGE=*'
               line='STAGE=6'
               state=present
-
-- name: ...HAS COMPLETED ===================================
-  command: echo

roles/7-edu-apps/tasks/main.yml

@@ -1,6 +1,5 @@
 # Educational Apps
-
+- name: ...IS BEGINNING ==================================
-- name: ...IS BEGINNING ========================================
   command: echo
 
 - name: KALITE
@@ -39,11 +38,8 @@
   when: sugarizer_install
   tags: sugarizer
 
-- name: Record STAGE 7
+- name: Recording STAGE 7 HAS COMPLETED ==================
   lineinfile: dest=/etc/iiab/iiab.env
              regexp='^STAGE=*'
               line='STAGE=7'
               state=present
-
-- name: ...HAS COMPLETED =======================================
-  command: echo

roles/8-mgmt-tools/tasks/main.yml

@@ -1,6 +1,6 @@
 # Assessment and Monitoring Tools
 
-- name: ...IS BEGINNING ======================================
+- name: ...IS BEGINNING ==================================
   command: echo
 
 - name: AWSTATS
@@ -51,11 +51,8 @@
   when: xovis_install and ansible_distribution != "CentOS"
   tags: xovis
 
-- name: Record STAGE 8
+- name: Recording STAGE 8 HAS COMPLETED ==================
   lineinfile: dest=/etc/iiab/iiab.env
              regexp='^STAGE=*'
               line='STAGE=8'
               state=present
-
-- name: ...HAS COMPLETED =====================================
-  command: echo

roles/9-local-addons/tasks/main.yml

@@ -1,7 +1,10 @@
 # Local Add-ons
 
-- name: ...IS BEGINNING ====================================
+- name: ...IS BEGINNING =============================
   command: echo
 
-- name: ...HAS COMPLETED ===================================
+- name: Recording STAGE 9 HAS COMPLETED =============
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=9'
+              state=present