From ac0d86a4dee14282ee582994430b521e424282d9 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 2 Nov 2017 22:36:11 -0500
Subject: [PATCH] Better O-init visuals

---
 roles/0-init/defaults/main.yml                | 33 ++++++++++++++++++-
 .../tasks/computed_vars.yml                   |  2 +-
 roles/0-init/tasks/main.yml                   | 13 ++++----
 roles/1-prep/defaults/main.yml                | 32 ------------------
 4 files changed, 39 insertions(+), 41 deletions(-)
 mode change 120000 => 100644 roles/0-init/defaults/main.yml
 rename roles/{1-prep => 0-init}/tasks/computed_vars.yml (98%)
 delete mode 100644 roles/1-prep/defaults/main.yml

diff --git a/roles/0-init/defaults/main.yml b/roles/0-init/defaults/main.yml
deleted file mode 120000
index b8fa87d4b..000000000
--- a/roles/0-init/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-/opt/iiab/iiab/roles/1-prep/defaults/main.yml
\ No newline at end of file
diff --git a/roles/0-init/defaults/main.yml b/roles/0-init/defaults/main.yml
new file mode 100644
index 000000000..9e41e02fc
--- /dev/null
+++ b/roles/0-init/defaults/main.yml
@@ -0,0 +1,32 @@
+# use these as a tag a release at a point in time
+iiab_base_ver: 6.4
+gui_version: 2
+
+# These entries should never be changed in this file.
+# These are defaults for boolean routines, 
+no_net_restart: False
+first_run: False
+installing: False
+discovered_wan_iface: "none"
+gw_active: "none"
+internet_available: False
+is_F18: False
+no_NM_reload: False
+exFAT_enabled: False
+gui_port: 80
+
+# Set default for discovered hardware
+rpi_model: none
+is_rpi: False
+xo_model: none
+rtc_id: ds3231
+NUC6_firmware_needed: False
+
+# used in 2-common xo.yml
+wifi_id: none
+
+is_F20: False
+is_F21: False
+is_F22: False
+is_F23: False
+is_F24: False
diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/0-init/tasks/computed_vars.yml
similarity index 98%
rename from roles/1-prep/tasks/computed_vars.yml
rename to roles/0-init/tasks/computed_vars.yml
index 0f19a5389..3063927ae 100644
--- a/roles/1-prep/tasks/computed_vars.yml
+++ b/roles/0-init/tasks/computed_vars.yml
@@ -210,7 +210,7 @@
     - option: 'FQDN_changed'
       value:  '{{ FQDN_changed }}'
 
-- name: add version section
+- name: STAGE 0 HAS COMPLETED ======================================
   ini_file: dest='{{ iiab_config_file }}'
             section=runtime
             option='{{ item.option }}'
diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index 528bf3aa9..ea72d214b 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -1,9 +1,9 @@
 # Initialize
 
 - name: ...IS BEGINNING ============================================
-  include_vars: roles/1-prep/defaults/main.yml
+  include_vars: roles/0-init/defaults/main.yml
 
-- name: Determine if runansible was run
+- name: Determine if installer was run
   stat: path=/etc/iiab/iiab.env
   register: NewInstall
 
@@ -14,10 +14,9 @@
 
 # we need to inialize the ini file and only write the location and version sections once and only
 # once to preserve the install date and git hash.
-- include_tasks: roles/1-prep/tasks/iiab_ini.yml
+- name: Write iiab_ini.yml for the first time
+  include_tasks: roles/1-prep/tasks/iiab_ini.yml
   when: first_run
-# Now load the computed vars
-- include_tasks: roles/1-prep/tasks/computed_vars.yml
 
-- name: ...HAS COMPLETED ===========================================
-  command: echo
+- name: Loading computed_vars
+  include_tasks: roles/0-init/tasks/computed_vars.yml
diff --git a/roles/1-prep/defaults/main.yml b/roles/1-prep/defaults/main.yml
deleted file mode 100644
index 9e41e02fc..000000000
--- a/roles/1-prep/defaults/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# use these as a tag a release at a point in time
-iiab_base_ver: 6.4
-gui_version: 2
-
-# These entries should never be changed in this file.
-# These are defaults for boolean routines, 
-no_net_restart: False
-first_run: False
-installing: False
-discovered_wan_iface: "none"
-gw_active: "none"
-internet_available: False
-is_F18: False
-no_NM_reload: False
-exFAT_enabled: False
-gui_port: 80
-
-# Set default for discovered hardware
-rpi_model: none
-is_rpi: False
-xo_model: none
-rtc_id: ds3231
-NUC6_firmware_needed: False
-
-# used in 2-common xo.yml
-wifi_id: none
-
-is_F20: False
-is_F21: False
-is_F22: False
-is_F23: False
-is_F24: False