diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index a0c1d9554..24d9f9683 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,6 +1,6 @@ # fl.yml signifies "file layout" -- name: Create 19 directories with ownership root:root and permissions 0755 (1 in /etc, 3 in {{ iiab_base }} and 15 in /library) # iiab_base is /opt/iiab +- name: Create directories with ownership root:root and permissions 0755 (1 in /etc, 3 in {{ iiab_base }} and 15 in /library) # iiab_base is /opt/iiab file: path: "{{ item }}" owner: root @@ -29,6 +29,7 @@ - "{{ doc_root }}/common/images" - "{{ doc_root }}/common/assets" - "{{ doc_root }}/common/services" + - "{{ py3_dist_path }}/iiab" - name: Symlink from {{ doc_root }}/common/webfonts to {{ doc_root }}/common/fonts file: diff --git a/roles/1-prep/templates/iiab_const.py.j2 b/roles/2-common/templates/iiab_const.py.j2 similarity index 100% rename from roles/1-prep/templates/iiab_const.py.j2 rename to roles/2-common/templates/iiab_const.py.j2 diff --git a/roles/1-prep/templates/iiab_lib.py b/roles/2-common/templates/iiab_lib.py similarity index 100% rename from roles/1-prep/templates/iiab_lib.py rename to roles/2-common/templates/iiab_lib.py diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 540bd8962..c977d8adf 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -28,6 +28,9 @@ content_base: "/library" doc_base: "{{ content_base }}/www" doc_root: "{{ doc_base }}/html" +# Python 3 dist path +py3_dist_path = /usr/lib/python3/dist-packages + # Ansible's default timeout for "get_url:" downloads (10 seconds) often fails download_timeout: 200