openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Make sure major upgrade script fails. 

Running upgrade-non-controller.sh against compute and object storage did
not fail if the /root/tripleo_upgrade_node.sh failed.

This make it harder to detect error in CI system for instance.

Change-Id: I12b7d640547d3b8ec1f70104d159d6052b7638ff
Closes-Bug: 1620973
This commit is contained in:
Sofer Athlan-Guyot 2016-09-07 11:25:41 +02:00 committed by Athlan-Guyot sofer
parent a87939a398
commit bc7f6ab041
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extraconfig/tasks/major_upgrade_compute.sh
View File

@ -12,6 +12,8 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT
### This file is automatically delivered to the compute nodes as part of the
### tripleo upgrades workflow
set -eu
# pin nova to kilo (messaging +-1) for the nova-compute service
crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute

1
extraconfig/tasks/major_upgrade_object_storage.sh
View File

@ -12,6 +12,7 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT
### This file is automatically delivered to the swift-storage nodes as part of the
### tripleo upgrades workflow
set -eu
function systemctl_swift {
action=\$1