From 6acb9b5acd963504a30cefb66b38156c756752c5 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 27 Apr 2020 16:34:32 -0500
Subject: [PATCH] move pylib.yml to own role

---
 roles/2-common/tasks/main.yml                             | 2 --
 roles/4-server-options/tasks/main.yml                     | 4 ++++
 roles/{2-common/tasks/pylib.yml => pylibs/tasks/main.yml} | 0
 roles/{2-common => pylibs}/templates/iiab_const.py.j2     | 0
 roles/{2-common => pylibs}/templates/iiab_env.py.j2       | 0
 roles/{2-common => pylibs}/templates/iiab_lib.py          | 0
 6 files changed, 4 insertions(+), 2 deletions(-)
 rename roles/{2-common/tasks/pylib.yml => pylibs/tasks/main.yml} (100%)
 rename roles/{2-common => pylibs}/templates/iiab_const.py.j2 (100%)
 rename roles/{2-common => pylibs}/templates/iiab_env.py.j2 (100%)
 rename roles/{2-common => pylibs}/templates/iiab_lib.py (100%)

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