cleanup

roles/0-init/tasks/computed_vars.yml

@@ -1,221 +0,0 @@
-- name: re-read local_facts.facts from /etc/ansible/facts.d
-  setup: filter=ansible_local
-
-# set top level variables from local facts for convenience
-- set_fact:
-      xo_model: '{{ ansible_local.local_facts.xo_model }}'
-      phplib_dir: '{{ ansible_local.local_facts.phplib_dir }}'
-      iiab_stage: '{{ ansible_local.local_facts.stage }}'
-
-# Networking uses a different file for the rpi
-- name: Discover if this is a rpi -- assume if so it is running raspbian
-  set_fact:
-      rpi_model: "rpi"
-      is_rpi: True
-      no_net_restart: True
-  when: ansible_local.local_facts.os == "raspbian"
-
-- name: Set exFAT enabled for XO laptops
-  set_fact:
-     exFAT_enabled: True
-  when: xo_model != "none"
-
-- name: set FQDN
-  set_fact:
-      iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}"
-      FQDN_changed: False
-
-- name: FQDN changed
-  set_fact:
-      FQDN_changed: True
-  when: iiab_fqdn != ansible_fqdn
-
-- name: Now check FQDN
-  include_tasks: roles/2-common/tasks/hostname.yml
-  when: FQDN_changed
-
-# Discover  do we have a gateway? -- if ansible detects gateway, becomes WAN candidate
-- name: Finding gateway
-  set_fact:
-      discovered_wan_iface: "{{ ansible_default_ipv4.alias }}"
-      iiab_wan_iface: "{{ discovered_wan_iface }}"
-  when: ansible_default_ipv4.gateway is defined
-
-- name: Verify gateway present
-  shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" | grep icmp_seq=4 | wc -l
-  when: discovered_wan_iface != "none"
-  register: gw_active_test
-
-- name: Recording gateway response
-  set_fact:
-      gw_active: True
-  when: discovered_wan_iface != "none" and gw_active_test.stdout == "1"
-
-- name: Test for internet access
-  get_url: url="{{ iiab_download_url }}/heart-beat.txt" dest=/tmp/heart-beat.txt
-  ignore_errors: True
-#  async: 10
-#  poll: 2
-  register: internet_access_test
-
-- name: Set internet_available true if wget succeeded
-  set_fact:
-      internet_available: True
-  when: not internet_access_test|failed and not disregard_network
-
-- name: Cleanup internet test file
-  file: path=/tmp/heart-beat.txt
-        state=absent
-
-# Put all computed vars here so derive properly from any prior var file
-- name: If the TZ is not set in env, set it to UTC
-  set_fact: local_tz='UTC'
-  when: local_tz == ""
-
-- name: Set port 80 for Admin Console
-  set_fact:
-    gui_port: 80
-  when: not adm_cons_force_ssl
-
-- name: Set port 443 for Admin Console
-  set_fact:
-    gui_port: 443
-  when: adm_cons_force_ssl
-
-- name: Require MySQL to be on
-  set_fact:
-    mysql_install: True
-    mysql_enabled: True
-
-# we decided to enable mysql unconditionally
-#  when: elgg_enabled or rachel_enabled or owncloud_enabled or phpmyadmin_enabled or wordpress_enabled or iiab_menu_install
-
-# Commenting out MongoDB on a trial basis, for a more basic/lightweight Sugarizer, per https://github.com/iiab/iiab/pull/427
-# - name: Turn on mongodb if sugarizer enabled
-#   set_fact:
-#     mongodb_install: True
-#     mongodb_enabled: True
-#   when: sugarizer_enabled
-
-# There might be other db's
-- name: Turn on PostgreSQL if Moodle or Pathagar enabled
-  set_fact:
-    postgresql_install: True
-    postgresql_enabled: True
-  when: moodle_enabled or pathagar_enabled
-
-- name: Turn on Docker if SchoolTool is to be installed
-  set_fact:
-    docker_install: True
-    docker_enabled: True
-  when: schooltool_enabled or schooltool_install
-
-- name: Set python_path for is_redhat
-  set_fact:
-    python_path: /usr/lib/python2.7/site-packages/
-  when: is_redhat
-
-- name: Set python_path for is_debuntu
-  set_fact:
-    python_path: /usr/local/lib/python2.7/dist-packages/
-  when: is_debuntu
-
-# for various reasons the mysql service can not be enabled on fedora 20,
-# but 'mariadb', which is its real name can
-# on fedora 18 we need to use 'mysqld'
-
-- name: Set mysqld_service to mariadb by default
-  set_fact:
-    mysql_service: mariadb
-
-- name: Set mysqld_service to mysqld for Fedora 18
-  set_fact:
-    mysql_service: mysqld
-    no_NM_reload: True
-    is_F18: True
-  when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18"
-
-- name: Set mysql_service to mysql for Debian
-  set_fact:
-    mysql_service: mysql
-  when: is_debuntu
-
-# PLATFORM variables
-- name: Fedora 20
-  set_fact:
-    is_F20: True
-  when: ansible_distribution == "Fedora" and ansible_distribution_version == "20"
-
-- name: Fedora 21
-  set_fact:
-    is_F21: True
-  when: ansible_distribution == "Fedora" and ansible_distribution_version == "21"
-
-- name: Fedora 22
-  set_fact:
-    is_F22: True
-  when: ansible_distribution == "Fedora" and ansible_distribution_version == "22"
-
-- name: Fedora 23
-  set_fact:
-    is_F23: True
-  when: ansible_distribution == "Fedora" and ansible_distribution_version == "23"
-
-- name: Fedora 24
-  set_fact:
-    is_F24: True
-  when: ansible_distribution == "Fedora" and ansible_distribution_version == "24"
-
-- name: CentOS
-  set_fact:
-    is_CentOS: True
-  when: ansible_distribution == "CentOS"
-
-- name: add version section
-  ini_file: dest='{{ iiab_config_file }}'
-            section=runtime
-            option='{{ item.option }}'
-            value='{{ item.value }}'
-  with_items:
-    - option: 'iiab_stage'
-      value: '{{ iiab_stage }}'
-    - option: 'runtime_php'
-      value: '{{ phplib_dir }}'
-    - option: 'runtime_branch'
-      value: '{{ ansible_local.local_facts.iiab_branch }}'
-    - option: 'runtime_commit'
-      value: '{{ ansible_local.local_facts.iiab_commit }}'
-    - option: 'runtime_date'
-      value: '{{ ansible_date_time.iso8601 }}'
-    - option: 'ansible_version'
-      value: '{{ ansible_local.local_facts.ansible_version }}'
-    - option: 'kernel'
-      value: '{{ ansible_kernel }}'
-    - option: 'memory_mb'
-      value: '{{ ansible_memtotal_mb }}'
-    - option: 'swap_mb'
-      value: '{{ ansible_swaptotal_mb }}'
-    - option: 'product_id'
-      value: '{{ ansible_product_uuid }}'
-    - option: 'gw_active'
-      value:  '{{ gw_active }}'
-    - option: 'internet_available'
-      value:  '{{ internet_available }}'
-    - option: 'is_rpi'
-      value:  '{{ is_rpi }}'
-    - option: 'first_run'
-      value:  '{{ first_run }}'
-    - option: 'local_tz'
-      value:  '{{ local_tz }}'
-    - option: 'FQDN_changed'
-      value:  '{{ FQDN_changed }}'
-
-- name: STAGE 0 HAS COMPLETED ======================================
-  ini_file: dest='{{ iiab_config_file }}'
-            section=runtime
-            option='{{ item.option }}'
-            value='{{ item.value }}'
-  with_items:
-    - option: 'is_VM'
-      value:  'yes'
-  when: is_VM is defined

roles/0-init/tasks/first_run.yml

@@ -0,0 +1,6 @@
+- name: Write iiab_ini.yml for the first time
+  include_tasks: iiab_ini.yml
+
+- name: Create the directory structure for IIAB
+  include_tasks: fl.yml
+

roles/0-init/tasks/fl.yml

@@ -0,0 +1,27 @@
+- name: Create various library directories
+  file: path={{ item }}
+        owner=root
+        group=root
+        mode=0755
+        state=directory
+  with_items:
+    - "{{ yum_packages_dir }}"
+    - "{{ pip_packages_dir }}"
+    - "{{ downloads_dir }}"
+    - /library/downloads/zims
+    - /library/downloads/rachel
+    - /library/working/zims
+    - /library/working/rachel
+    - "{{ iiab_zim_path }}/content"
+    - "{{ iiab_zim_path }}/index"
+    - "{{ doc_root }}/modules"
+    - "{{ doc_root }}/common/css"
+    - "{{ doc_root }}/common/js"
+    - "{{ doc_root }}/common/fonts"
+    - "{{ doc_root }}/common/html"
+    - "{{ doc_root }}/common/images"
+    - "{{ doc_root }}/common/assets"
+    - "{{ doc_root }}/common/services"
+    - /etc/sysconfig/olpc-scripts/
+    - /etc/sysconfig/olpc-scripts/setup.d/installed/
+

roles/0-init/tasks/iiab_ini.yml

@@ -0,0 +1,35 @@
+# workaround for fact that auto create does not work on ini_file
+- name: Create iiab config file
+  file: dest='{{ iiab_config_file }}'
+        state=touch
+
+- name: Add location section to config file
+  ini_file: dest='{{ iiab_config_file }}'
+            section=location
+            option='{{ item.option }}'
+            value='{{ item.value }}'
+  with_items:
+    - option: 'iiab_base'
+      value: '{{ iiab_base }}'
+    - option: 'iiab_dir'
+      value: '{{ iiab_dir }}'
+
+- name: Add version section
+  ini_file: dest='{{ iiab_config_file }}'
+            section=version
+            option='{{ item.option }}'
+            value='{{ item.value }}'
+  with_items:
+    - option: 'distribution'
+      value: '{{ ansible_distribution }}'
+    - option: 'arch'
+      value: '{{ ansible_architecture }}'
+    - option: 'iiab_branch'
+      value: '{{ ansible_local["local_facts"]["iiab_branch"] }}'
+    - option: 'iiab_commit'
+      value: '{{ ansible_local["local_facts"]["iiab_commit"] }}'
+    - option: 'install_date'
+      value: '{{ ansible_date_time["iso8601"] }}'
+    - option: 'install_xo'
+      value: '{{ xo_model }}'
+

roles/0-init/tasks/main.yml

@@ -12,7 +12,7 @@
 # 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.
 - name: Write iiab_ini.yml for the first time
-  include_tasks: roles/1-prep/tasks/iiab_ini.yml
+  include_tasks: first_run.yml
   when: first_run
 
 #- name: Loading computed_vars