Merge "Adapt code to newer code style (linters)"

This commit is contained in:
Zuul 2018-11-20 06:34:00 +00:00 committed by Gerrit Code Review
commit 306f2700c7
4 changed files with 19 additions and 19 deletions

View File

@ -16,7 +16,7 @@
only_successful_tasks: "{{ influxdb_only_successful_tasks }}"
- name: Get ARA json data for undercloud
become: yes
become: true
shell: "{{ local_working_dir }}/bin/ara result list --all -f json"
register: ara_root_data

View File

@ -306,7 +306,7 @@
dest: "/tmp/{{ inventory_hostname }}-rsync-filter"
- name: Gather the logs to /tmp
become: yes
become: true
shell: >
set -o pipefail &&
rsync --quiet --recursive --copy-links --prune-empty-dirs
@ -333,16 +333,16 @@
fetch:
src: "/tmp/{{ inventory_hostname }}.tar.gz"
dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz"
flat: yes
validate_checksum: no
flat: true
validate_checksum: false
when: artcl_tar_gz|bool
- name: Fetch log archive (tar)
fetch:
src: "/tmp/{{ inventory_hostname }}.tar"
dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar"
flat: yes
validate_checksum: no
flat: true
validate_checksum: false
when: artcl_gzip_only|bool
- name: Delete temporary log directory after collection

View File

@ -8,8 +8,8 @@
shell: >
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
ignore_errors: true
when: artcl_gzip_only|bool
- name: Generate rST docs from scripts and move to Sphinx src dir
shell: >
@ -17,19 +17,19 @@
"{{ 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
ignore_errors: true
- name: Fetch static rST docs to include in output docs
shell: >
cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}"
with_items: "{{ artcl_create_docs_payload.included_static_docs }}"
ignore_errors: yes
ignore_errors: true
- name: Generate fresh index.rst for Sphinx
template:
src: index.rst.j2
dest: "{{ artcl_docs_source_dir }}/index.rst"
force: yes
force: true
- name: Ensure docs dir exists
file:
@ -41,4 +41,4 @@
set -o pipefail &&
sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}"
2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log
ignore_errors: yes
ignore_errors: true

View File

@ -21,35 +21,35 @@
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json;
cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq;{% endif %}
ignore_errors: yes
ignore_errors: true
- name: Generate and retrieve root the ARA static playbook report
become: yes
become: true
shell: >
{{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root;
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json;
cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_root;{% endif %}
ignore_errors: yes
ignore_errors: true
- name: Generate and retrieve the ARA static playbook report for OC deploy
become: yes
become: true
shell: >
{{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc;
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json;
cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_oc;{% endif %}
ignore_errors: yes
ignore_errors: true
environment:
ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}'
- include: ara_graphite.yml
when: ara_graphite_server is defined
ignore_errors: yes
ignore_errors: true
- include: ara_influxdb.yml
when: influxdb_url is defined or influxdb_create_data_file|bool
ignore_errors: yes
ignore_errors: true
- name: fetch stackviz results to the root of the collect_dir
shell: >