Merge pull request #2368 from jvonau/py_4

move pylib.yml to stage 4
2025-03-09 15:40:17 +00:00 · 2020-04-28 09:28:45 -04:00 · 2020-04-28 09:28:45 -04:00 · c52f130aa7
commit c52f130aa7
parent 870c24bd4c ddb2e034ef
6 changed files with 4 additions and 2 deletions
--- 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"

--- 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
--- a/roles/2-common/tasks/pylib.yml
+++ b/roles/2-common/tasks/pylib.yml
--- a/roles/2-common/templates/iiab_const.py.j2
+++ b/roles/2-common/templates/iiab_const.py.j2
--- a/roles/2-common/templates/iiab_env.py.j2
+++ b/roles/2-common/templates/iiab_env.py.j2
--- a/roles/2-common/templates/iiab_lib.py
+++ b/roles/2-common/templates/iiab_lib.py