Integrate undercloud_user var into oooq-extras
We need to differentiate local_working_dir from working_dir as well as decouple the stack user from `ansible_user` var. Both of these are causing issues as we begin to automate deployments in more environments. - Cleanup duplicate variables that are consumed via extras-common - Note: extras-common depends on the common role in OOOQ - Cleanup redundant var and superfluous quotes from overcloud-scale role - Cleanup redundant comments in <role>/defaults/main.yml Closes-bug: 1654574 Change-Id: I9c7a3166ed1fc5042c11e420223134ea912b45c5
This commit is contained in:
parent
bdfd57bcea
commit
cf6a68fa44
|
@ -1,6 +1,5 @@
|
|||
---
|
||||
|
||||
## collection related vars
|
||||
artcl_collect: true
|
||||
artcl_collect_list:
|
||||
- /var/log/
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
dependencies:
|
||||
- extras-common
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
- name: Unarchive shell scripts
|
||||
shell: >
|
||||
gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ ansible_user }}/{{ item }}.sh.gz";
|
||||
gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz";
|
||||
with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
|
||||
ignore_errors: yes
|
||||
when: artcl_gzip_only|bool
|
||||
|
@ -14,7 +14,7 @@
|
|||
- 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" \
|
||||
"{{ artcl_collect_dir }}/undercloud/home/{{ ansible_user }}/{{ item }}.sh" > \
|
||||
"{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \
|
||||
"{{ artcl_docs_source_dir }}/{{ item }}.rst"
|
||||
with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
|
||||
ignore_errors: yes
|
||||
|
|
Loading…
Reference in New Issue