openstack/tripleo-upgrade
Code Issues Proposed changes

Set pipefail during overcloud upgrade tasks.

Browse Source 
Without pipefail set, errors are masked by awk. So conditional
blocks are always skipped.

Change-Id: I7dde76c3c2d2741c775c348b71f4ae264cfcfcca
This commit is contained in:
Yurii Prokulevych 2018-11-01 10:41:38 +01:00
parent b642e177e8
commit 744200947c
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/upgrade/ceph_upgrade_run.yml
View File

@ -1,7 +1,8 @@
---
- name: run Ceph upgrade
shell: |
{{ working_dir }}/ceph-upgrade-run.sh 2>&1 {{ timestamper_cmd }} > \
set -o pipefail
bash {{ working_dir }}/ceph-upgrade-run.sh 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/ceph-upgrade-run.log
ignore_errors: true
register: ceph_upg_status

6
tasks/upgrade/overcloud_upgrade_converge.yml
View File

@ -1,7 +1,9 @@
---
- name: run major upgrade converge step
shell: "bash {{ overcloud_upgrade_converge_script }} 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/overcloud_upgrade_converge.log"
shell: |
set -o pipefail
bash {{ overcloud_upgrade_converge_script }} 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/overcloud_upgrade_converge.log
register: overcloud_converge_upgrade
ignore_errors: yes

6
tasks/upgrade/overcloud_upgrade_prepare.yml
View File

@ -21,8 +21,10 @@
force: true
- name: setup HEAT outputs via upgrade prepare
shell: "bash {{ overcloud_upgrade_prepare_script }} 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/overcloud_upgrade_prepare.log"
shell: |
set -o pipefail
bash {{ overcloud_upgrade_prepare_script }} 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/overcloud_upgrade_prepare.log
register: overcloud_upgrade_prepare
ignore_errors: yes

6
tasks/upgrade/overcloud_upgrade_run.yml
View File

@ -1,7 +1,9 @@
---
- name: run overcloud major upgrade in each of the roles/hostgroups
shell: "bash {{ overcloud_upgrade_run_script_base }}-{{ item }}.sh \
2>&1 {{ timestamper_cmd }} > {{ working_dir }}/overcloud_upgrade_run_{{ item }}.log"
shell: |
set -o pipefail
bash {{ overcloud_upgrade_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \
{{ working_dir }}/overcloud_upgrade_run_{{ item }}.log
with_items:
- "{{ oc_roles|default('all') }}"
register: overcloud_upgrade_nodes