diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml index 9ebf80444..093067148 100644 --- a/roles/2-common/tasks/main.yml +++ b/roles/2-common/tasks/main.yml @@ -6,8 +6,6 @@ - name: Create IIAB directory structure ("file layout") include_tasks: fl.yml -- include_tasks: pylib.yml - - include_tasks: centos.yml when: ansible_distribution == "CentOS" diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 58e7c5f3b..9b748157f 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -5,6 +5,10 @@ path: "{{ iiab_state_file }}" state: touch +- name: Install IIAB's python libs + include_role: + name: pylibs + - name: Install named / BIND include_tasks: roles/network/tasks/named.yml when: named_install | bool diff --git a/roles/2-common/tasks/pylib.yml b/roles/pylibs/tasks/main.yml similarity index 100% rename from roles/2-common/tasks/pylib.yml rename to roles/pylibs/tasks/main.yml diff --git a/roles/2-common/templates/iiab_const.py.j2 b/roles/pylibs/templates/iiab_const.py.j2 similarity index 100% rename from roles/2-common/templates/iiab_const.py.j2 rename to roles/pylibs/templates/iiab_const.py.j2 diff --git a/roles/2-common/templates/iiab_env.py.j2 b/roles/pylibs/templates/iiab_env.py.j2 similarity index 100% rename from roles/2-common/templates/iiab_env.py.j2 rename to roles/pylibs/templates/iiab_env.py.j2 diff --git a/roles/2-common/templates/iiab_lib.py b/roles/pylibs/templates/iiab_lib.py similarity index 100% rename from roles/2-common/templates/iiab_lib.py rename to roles/pylibs/templates/iiab_lib.py