Merge "Fix path for collect-logs role"

ansible.cfg

@@ -5,4 +5,4 @@ retry_files_enabled = False
 callback_whitelist = profile_tasks
 
 # Attempt to load custom modules whether it's installed system-wide or from a virtual environment
-roles_path = roles:$VIRTUAL_ENV/usr/share/local/ansible/roles/tripleo-collect-logs:$VIRTUAL_ENV/usr/local/share/local
+roles_path = roles:$VIRTUAL_ENV/usr/share/local/ansible/roles/tripleo-collect-logs:$VIRTUAL_ENV/share/local

defaults/main.yml

@@ -345,7 +345,7 @@ artcl_create_docs_payload:
   included_deployment_scripts: []
   included_static_docs: []
   table_of_contents: []
-artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source"
+artcl_docs_source_dir: "{{ local_working_dir }}/share/ansible/roles/collect-logs/docs/source"
 artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build"
 artcl_verify_sphinx_build: false
 artcl_logstash_files:

tasks/create-docs.yml

@@ -2,12 +2,12 @@
 
 - name: Ensure required python packages are installed
   pip:
-    requirements: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/doc-requirements.txt"
+    requirements: "{{ local_working_dir }}/share/ansible/roles/collect-logs/docs/doc-requirements.txt"
     executable: "{{ local_working_dir }}/bin/pip"
 
 - name: Generate rST docs from scripts and move to Sphinx src dir
   shell: >
-     awk -f "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/scripts/doc_extrapolation.awk" \
+     awk -f "{{ local_working_dir }}/share/ansible/roles/collect-logs/scripts/doc_extrapolation.awk" \
        "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \
        "{{ artcl_docs_source_dir }}/{{ item }}.rst"
   with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"