From 055e99ae4323dd6d7f7655b9bf94bbfcb4febcac Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 15 Jan 2019 06:08:36 -0600
Subject: [PATCH 1/4] moved to 'iiab'

---
 roles/0-init/tasks/fl.yml   | 1 -
 roles/1-prep/tasks/main.yml | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/roles/0-init/tasks/fl.yml b/roles/0-init/tasks/fl.yml
index 3f9c8c584..44116ee70 100644
--- a/roles/0-init/tasks/fl.yml
+++ b/roles/0-init/tasks/fl.yml
@@ -6,7 +6,6 @@
     mode: 0755
     state: directory
   with_items:
-    - /etc/iiab
     - /etc/sysconfig/olpc-scripts/
     - /etc/sysconfig/olpc-scripts/setup.d/installed/
     - "{{ yum_packages_dir }}"
diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index b120c37a7..418510c90 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -16,12 +16,6 @@
     path: /etc/iiab/uuid
   register: uuid_file
 
-- name: If not, create folder /etc/iiab
-  file:
-    path: /etc/iiab
-    state: directory
-  when: not uuid_file.stat.exists
-
 - name: If no uuid exists, create one
   shell: uuidgen
   register: uuid_response

From a1e67313035612fe645085abe02baeede78f0d3c Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 15 Jan 2019 06:12:46 -0600
Subject: [PATCH 2/4] cleanup

---
 roles/0-init/tasks/fl.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/roles/0-init/tasks/fl.yml b/roles/0-init/tasks/fl.yml
index 44116ee70..c50ebf27f 100644
--- a/roles/0-init/tasks/fl.yml
+++ b/roles/0-init/tasks/fl.yml
@@ -1,4 +1,4 @@
-- name: Create 21 directories with ownership root:root and permissions 0755 (3 in /etc, 3 in {{ iiab_base }} and 15 in /library)    # iiab_base is /opt/iiab
+- name: Create 20 directories with ownership root:root and permissions 0755 (1 in /etc, 3 in {{ iiab_base }} and 15 in /library)    # iiab_base is /opt/iiab
   file:
     path: "{{ item }}"
     owner: root
@@ -6,7 +6,6 @@
     mode: 0755
     state: directory
   with_items:
-    - /etc/sysconfig/olpc-scripts/
     - /etc/sysconfig/olpc-scripts/setup.d/installed/
     - "{{ yum_packages_dir }}"
     - "{{ pip_packages_dir }}"

From 9d3ff4c16a9f0e709323659cf6bd8255d9a2034c Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 15 Jan 2019 06:16:08 -0600
Subject: [PATCH 3/4] move fl.yml

---
 roles/0-init/tasks/first_run.yml        | 3 ---
 roles/{0-init => 2-common}/tasks/fl.yml | 0
 roles/2-common/tasks/main.yml           | 3 +++
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename roles/{0-init => 2-common}/tasks/fl.yml (100%)

diff --git a/roles/0-init/tasks/first_run.yml b/roles/0-init/tasks/first_run.yml
index 3a8fa2770..332da85b7 100644
--- a/roles/0-init/tasks/first_run.yml
+++ b/roles/0-init/tasks/first_run.yml
@@ -1,5 +1,2 @@
-- name: Create IIAB directory structure
-  include_tasks: fl.yml
-
 - name: Create {{ iiab_ini_file }}
   include_tasks: iiab_ini.yml
diff --git a/roles/0-init/tasks/fl.yml b/roles/2-common/tasks/fl.yml
similarity index 100%
rename from roles/0-init/tasks/fl.yml
rename to roles/2-common/tasks/fl.yml
diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml
index 8dad669df..30dbca766 100644
--- a/roles/2-common/tasks/main.yml
+++ b/roles/2-common/tasks/main.yml
@@ -3,6 +3,9 @@
 - name: ...IS BEGINNING ==========================================
   command: echo
 
+- name: Create IIAB directory structure
+  include_tasks: fl.yml
+
 - include_tasks: centos.yml
   when: ansible_distribution == "CentOS"
 

From f3f19f7ff8d52f37e8858b0e57fe455a4d031969 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 15 Jan 2019 14:52:19 -0500
Subject: [PATCH 4/4] Update fl.yml

---
 roles/2-common/tasks/fl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml
index c50ebf27f..3bb1544b1 100644
--- a/roles/2-common/tasks/fl.yml
+++ b/roles/2-common/tasks/fl.yml
@@ -1,4 +1,4 @@
-- name: Create 20 directories with ownership root:root and permissions 0755 (1 in /etc, 3 in {{ iiab_base }} and 15 in /library)    # iiab_base is /opt/iiab
+- name: Create 19 directories with ownership root:root and permissions 0755 (1 in /etc, 3 in {{ iiab_base }} and 15 in /library)    # iiab_base is /opt/iiab
   file:
     path: "{{ item }}"
     owner: root