Move ICPC image fixes to separate role.

Author: nickygerritsen

icpc-wf/ansible/admin.yml

@@ -9,6 +9,9 @@
   roles:
     - role: base_packages
       tags: base_packages
+    - role: icpc_fixes
+      tags: icpc_fixes
+      when: ICPC_IMAGE
     - role: system_fixes
       tags: system_fixes
     - role: hosts

icpc-wf/ansible/domserver.yml

@@ -9,6 +9,9 @@
   roles:
     - role: base_packages
       tags: base_packages
+    - role: icpc_fixes
+      tags: icpc_fixes
+      when: ICPC_IMAGE
     - role: system_fixes
       tags: system_fixes
     - role: hosts

icpc-wf/ansible/group_vars/all/all.yml

@@ -18,6 +18,9 @@ DOMSERVER_URL: "{{DOMSERVER}}"
 DOMSERVER_SSL_CERT: /etc/ssl/certs/domserver.crt
 DOMSERVER_SSL_KEY: /etc/ssl/private/domserver.key
 
+# Set this to true when you are using the ICPC World Finals Contest Image
+ICPC_IMAGE: false
+
 # Set this when on the blue network at the World Finals where no
 # internet access is available and "packages" must be used as APT repo
 # server.

icpc-wf/ansible/judgehost.yml

@@ -9,6 +9,9 @@
   roles:
     - role: base_packages
       tags: base_packages
+    - role: icpc_fixes
+      tags: icpc_fixes
+      when: ICPC_IMAGE
     - role: system_fixes
       tags: system_fixes
     - role: hosts

icpc-wf/ansible/roles/icpc_fixes/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+# Define here handlers associated to this role.
+
+- name: restart systemd timesyncd
+  command: systemctl restart systemd-timesyncd

icpc-wf/ansible/roles/icpc_fixes/tasks/main.yml

@@ -0,0 +1,29 @@
+---
+# These tasks perform fixes used on the ICPC image to the base system.
+
+- name: add NTP servers
+  lineinfile:
+    dest: /etc/systemd/timesyncd.conf
+    regexp: '^#?NTP='
+    line: "NTP=10.3.3.208 10.3.3.209"
+  notify: restart systemd timesyncd
+  when: WF_RESTRICTED_NETWORK
+
+- name: remove source line from interfaces
+  lineinfile:
+    dest: /etc/network/interfaces
+    regexp: '^source-'
+    state: absent
+
+- name: Re-order PXEboot
+  shell: efibootmgr -o {{ EFI_ORDER }}
+  when: EFI_ORDER is defined
+
+- name: disable mumble,selfie services
+  service:
+    name: "{{ item }}"
+    state: stopped
+    enabled: no
+  with_items:
+    - mumble-server
+    - selfie

icpc-wf/ansible/roles/system_fixes/handlers/main.yml

@@ -1,8 +1,5 @@
 ---
 # Define here handlers associated to this role.
 
-- name: restart systemd timesyncd
-  command: systemctl restart systemd-timesyncd
-
 - name: update dconf
   shell: dconf update

icpc-wf/ansible/roles/system_fixes/tasks/main.yml

@@ -1,24 +1,6 @@
 ---
 # These tasks perform miscellaneous fixes to the base system.
 
-- name: add NTP servers
-  lineinfile:
-    dest: /etc/systemd/timesyncd.conf
-    regexp: '^#?NTP='
-    line: "NTP=10.3.3.208 10.3.3.209"
-  notify: restart systemd timesyncd
-  when: WF_RESTRICTED_NETWORK
-
-- name: remove source line from interfaces
-  lineinfile:
-    dest: /etc/network/interfaces
-    regexp: '^source-'
-    state: absent
-
-- name: Re-order PXEboot
-  shell: efibootmgr -o {{ EFI_ORDER }}
-  when: EFI_ORDER is defined
-
 - name: set timezone
   timezone:
     name: "{{TIMEZONE}}"
@@ -46,12 +28,3 @@
 - name: Force enable alt-tab for switching windows
   copy: src=dconf/ dest=/etc/dconf/
   notify: update dconf
-
-- name: disable mumble,selfie services
-  service:
-    name: "{{ item }}"
-    state: stopped
-    enabled: no
-  with_items:
-    - mumble-server
-    - selfie