diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 6f43f84a2..2b1672f1a 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -21,11 +21,6 @@ state: restarted when: not installing -- name: Create a Python interface to iiab.env - template: - src: roles/1-prep/templates/iiab_env.py.j2 - dest: /etc/iiab/iiab_env.py - - name: Recording STAGE 3 HAS COMPLETED ===================== lineinfile: dest: "{{ iiab_env_file }}" diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 2a226583c..82e5a1aab 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -13,11 +13,6 @@ when: named_install | bool tags: base, named, network, domain -- name: Installing captive portal - include_tasks: roles/captive-portal/tasks/main.yml - when: captive_portal_install | bool - tags: base, captive-portal, network, domain - - name: Installing dhcpd include_tasks: roles/network/tasks/dhcpd.yml when: dhcpd_install | bool @@ -28,6 +23,22 @@ when: squid_install | bool tags: base, squid, network, domain +# until porting is complete +- name: Install python2 + package: + name: python2 + state: present + +- name: Create a Python interface to iiab.env + template: + src: roles/1-prep/templates/iiab_env.py.j2 + dest: /etc/iiab/iiab_env.py + +- name: Installing captive portal + include_tasks: roles/captive-portal/tasks/main.yml + when: captive_portal_install | bool + tags: base, captive-portal, network, domain + - name: Install Bluetooth - only on Raspberry Pi include_role: name: bluetooth