openstack/tripleo-upgrade
Code Issues Proposed changes

Sync up upgrades and updates workarounds mechanism.

Browse Source 
Up to now, the minor updates workarounds was not being used very much
being a little bit left away in comparision with what it was implemented
for the upgrades one. This patch allows minor updates to benefit from
the same workarounds mechanism, at the same time that any improvement
in the upgrades mechanism will be available for updates too.

Also, it was removed the references to the {{ working_dir }} variable
in those shell tasks which have the argument changing directory to that
very same {{ working_dir }}, mostly to simplify the tasks and remove
redundancy.

Change-Id: Ibc57c51ff19ebad093c887bee545ca6a7d51827f
This commit is contained in:
Jose Luis Franco Arza
2019-09-24 22:02:20 +02:00
committed by Lukas Bezdicka
parent 4d189c08d4
commit ef15456503
10 changed files with 191 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tasks/upgrade/main.yml
View File

@@ -14,7 +14,7 @@
- name: apply pre undercloud OS upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_undercloud_os_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_undercloud_os_upgrade_workarounds.log
bash pre_undercloud_os_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_undercloud_os_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds|bool
@@ -28,7 +28,7 @@
- name: apply post undercloud OS upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_undercloud_os_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_undercloud_os_upgrade_workarounds.log
bash post_undercloud_os_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_undercloud_os_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds|bool
@@ -40,7 +40,7 @@
- name: apply pre undercloud upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_undercloud_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_undercloud_upgrade_workarounds.log
bash pre_undercloud_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_undercloud_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -68,7 +68,7 @@
- name: apply post undercloud upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_undercloud_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_undercloud_upgrade_workarounds.log
bash post_undercloud_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_undercloud_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -87,7 +87,7 @@
- name: apply pre overcloud upgrade prepare workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_overcloud_upgrade_prepare_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_prepare_workarounds.log
bash pre_overcloud_upgrade_prepare_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_prepare_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -99,7 +99,7 @@
- name: apply post overcloud upgrade prepare workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_overcloud_upgrade_prepare_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_overcloud_upgrade_prepare_workarounds.log
bash post_overcloud_upgrade_prepare_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_overcloud_upgrade_prepare_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -110,7 +110,7 @@
chdir: "{{ working_dir }}"
shell: |
set -o pipefail
bash {{ working_dir }}/overcloud_prepare_containers.sh {{ timestamper_cmd }} > overcloud_upgrade_prepare_containers.log
bash overcloud_prepare_containers.sh {{ timestamper_cmd }} > overcloud_upgrade_prepare_containers.log
tags: overcloud_upgrade_prepare_containers
- name: Ensure ansible-pacemaker module is present in CI.
@@ -133,7 +133,7 @@
- name: apply pre Ceph upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_ceph_upgrade_workarounds.log
bash pre_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_ceph_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -145,7 +145,7 @@
- name: apply post Ceph upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ceph_upgrade_workarounds.log
bash post_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ceph_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -155,13 +155,13 @@
chdir: "{{ working_dir }}"
shell: |
set -o pipefail
bash {{ working_dir }}/overcloud_online_data_migration.sh 2>&1 {{ timestamper_cmd }} > overcloud_upgrade_data_migration.log
bash overcloud_online_data_migration.sh 2>&1 {{ timestamper_cmd }} > overcloud_upgrade_data_migration.log
######## Overcloud upgrade converge ########
- name: apply pre overcloud upgrade converge workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_converge_workarounds.log
bash pre_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
@@ -173,7 +173,7 @@
- name: apply post overcloud upgrade converge workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_overcloud_upgrade_converge_workarounds.log
bash post_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_overcloud_upgrade_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds