openstack/kolla-ansible
Code Issues Proposed changes

Handle more return codes from nova-status upgrade check

Browse Source 
In a single controller scenario, the "Upgrade status check result"
does nothing because the previous task can only succeed when
`nova-status upgrade check` returns code 0. This change allows this
command to fail, so that the value of returned code stored in
`nova_upgrade_check_stdout` can then be analysed.

This change also allows for warnings (rc 1) to pass.
Closes-Bug: 1834647

Change-Id: I6f5e37832f43f23604920b9d890cc505ca924ff9
This commit is contained in:
Mariusz
2019-06-28 13:33:39 +00:00
committed by Mariusz Karpiarz
parent 54856a873f
commit c68ed4dd51
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/nova/tasks/upgrade.yml
View File

@@ -4,15 +4,16 @@
command: docker exec -t nova_api nova-status upgrade check command: docker exec -t nova_api nova-status upgrade check
register: nova_upgrade_check_stdout register: nova_upgrade_check_stdout
when: inventory_hostname == groups['nova-api'][0] when: inventory_hostname == groups['nova-api'][0]
failed_when: false
- name: Upgrade status check result - name: Upgrade status check result
fail: fail:
msg: msg:
- "There was an upgrade status check warning or failure!" - "There was an upgrade status check failure!"
- "See the detail at https://docs.openstack.org/nova/latest/cli/nova-status.html#nova-status-checks" - "See the detail at https://docs.openstack.org/nova/latest/cli/nova-status.html#nova-status-checks"
vars: vars:
first_nova_api_host: "{{ groups['nova-api'][0] }}" first_nova_api_host: "{{ groups['nova-api'][0] }}"
when: hostvars[first_nova_api_host]['nova_upgrade_check_stdout']['rc'] != 0 when: hostvars[first_nova_api_host]['nova_upgrade_check_stdout']['rc'] not in [0, 1]
- include_tasks: legacy_upgrade.yml - include_tasks: legacy_upgrade.yml
when: not nova_enable_rolling_upgrade | bool when: not nova_enable_rolling_upgrade | bool