Merge pull request #381 from jvonau/more_bs

ensure network is completed before saying first_run is complete

roles/1-prep/tasks/prep.yml

@@ -32,25 +32,6 @@
         mode=0755
         state=directory
 
-# this script can be sourced to get iiab location
-- name: Create iiab.env file
-  template: src=iiab.env.j2
-            dest=/etc/iiab/iiab.env
-            owner=root
-            group=root
-            mode=0644
-
-- name: put a python interface to iiab.env
-  template: src=iiab_env.py.j2
-            dest=/etc/iiab/iiab_env.py
-
-- name: create ansible.d facts directory
-  file: path=/etc/ansible/facts.d
-        owner=root
-        group=root
-        mode=0750
-        state=directory
-
 - name: Set XO model
   set_fact:
     phplib_dir: '{{ ansible_local["local_facts"]["phplib_dir"] }}'

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

@@ -11,8 +11,8 @@
   when: not installing
 
 # If we got here we're done
-- name: Record base gui version
+#- name: Record base gui version
-  lineinfile: dest=/etc/iiab/iiab.env
+#  lineinfile: dest=/etc/iiab/iiab.env
-              regexp='^BASE_VERSION=*'
+#              regexp='^BASE_VERSION=*'
-              line='BASE_VERSION="{{ gui_version }}"'
+#              line='BASE_VERSION="{{ gui_version }}"'
-              state=present
+#              state=present

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

@@ -1,6 +1,22 @@
 - name: Server Options Installed
   command: echo Server Options Installed
 
+# this script can be sourced to get iiab location
+- name: Create iiab.env file
+  template: src=roles/1-prep/templates/iiab.env.j2
+            dest=/etc/iiab/iiab.env
+            owner=root
+            group=root
+            mode=0644
+
+- name: put a python interface to iiab.env
+  template: src=roles/1-prep/templates/iiab_env.py.j2
+            dest=/etc/iiab/iiab_env.py
+
+- name: generate the offline documents
+  command: /usr/bin/iiab-refresh-wiki-docs
+  when: not nodocs
+
 - name: Stop postgresql service
   command: "/etc/init.d/postgresql stop"
   ignore_errors: True
@@ -22,5 +38,3 @@
   service: name=xs-authserver
            state=restarted
   when: authserver_enabled
-
-

roles/httpd/tasks/main.yml

@@ -153,10 +153,6 @@
             dest=/usr/bin/iiab-refresh-wiki-docs
             mode=0755
 
-- name: generate the offline documents
-  command: /usr/bin/iiab-refresh-wiki-docs
-  when: not nodocs
-
 - name: Give apache_user permission for poweroff
   template: src=020_apache_poweroff.j2
             dest=/etc/sudoers.d/020_apache_poweroff