Merge pull request #535 from jvonau/had-1116-bugs

had-1116-bugs

roles/0-init/tasks/hostname.yml

@@ -18,10 +18,10 @@
               group=root
               mode=0644
 
-- name: Re-configuring httpd - not initial install
-  include_tasks: roles/httpd/tasks/main.yml
-  when: iiab_stage|int > 3
+#- name: Re-configuring httpd - not initial install
+#  include_tasks: roles/httpd/tasks/main.yml
+#  when: iiab_stage|int > 3
 
-- name: Re-configuring rest of networking - not initial install
-  include_tasks: roles/network/tasks/main.yml
-  when: iiab_stage|int > 4
+#- name: Re-configuring rest of networking - not initial install
+#  include_tasks: roles/network/tasks/main.yml
+#  when: iiab_stage|int > 4

roles/0-init/tasks/main.yml

@@ -199,7 +199,7 @@
       value:  '{{ FQDN_changed }}'
 
 - name: Now changing FQDN
-  include_tasks: roles/2-common/tasks/hostname.yml
+  include_tasks: hostname.yml
   when: FQDN_changed
 
 - name: STAGE 0 HAS COMPLETED ======================================

roles/network/tasks/computed_network.yml

@@ -6,19 +6,19 @@
      user_wan_iface: "{{ discovered_wan_iface }}"
   when: discovered_wan_iface != "none" and xo_model != "none" and has_ifcfg_gw == "none"
 
-- name: Checking for NetworkManager-config-server
-  shell: rpm -qa | grep  NetworkManager-config-server | wc -l
-  register: strict_networking_check
+#- name: Checking for NetworkManager-config-server
+#  shell: rpm -qa | grep  NetworkManager-config-server | wc -l
+#  register: strict_networking_check
 
-- name: Found Checking for NetworkManager-config-server
-  set_fact:
-     strict_networking: True
-  when: strict_networking_check == "1"
+#- name: Found Checking for NetworkManager-config-server
+#  set_fact:
+#     strict_networking: True
+#  when: strict_networking_check == "1"
 
-- name: Use restricted network features
-  set_fact:
-     iiab_demo_mode: True
-  when: teamviewer_install and not strict_networking
+#- name: Use restricted network features
+#  set_fact:
+#     iiab_demo_mode: True
+#  when: teamviewer_install and not strict_networking
 
 - name: XO laptop wants USB WiFi interface as AP mode
   set_fact:

roles/network/tasks/dhcpd.yml

@@ -17,7 +17,13 @@
         createhome=no
   when: is_debuntu
 
-- name: Configure dhcpd
+- name: Disable stock dhcp_service
+  service: name={{ dhcp_service }}
+           enabled=no
+           state=stopped
+  when: is_debuntu
+
+- name: Install systemd unit file to /etc/systemd/system/dhcpd.service
   template: src={{ item.src }}
             dest={{ item.dest }}
             owner=root

roles/network/tasks/enable_services.yml

@@ -1,9 +1,3 @@
-- name: Disable stock dhcp_service
-  service: name={{ dhcp_service }}
-           enabled=no
-           state=stopped
-  when: dhcpd_install and first_run and is_debuntu
-
 - name: Disable dhcpd service
   service: name=dhcpd
            enabled=no

roles/network/tasks/restart.yml

@@ -10,6 +10,7 @@
 - name: Stop Squid service
   service: name={{ proxy }}
            state=stopped
+  async: 120
   when: squid_install
 
 - name: Stop DansGuardian