diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2016-09-07 11:25:41 +0200 |
|---|---|---|
| committer | Athlan-Guyot sofer <sathlang@redhat.com> | 2016-09-21 08:02:17 +0000 |
| commit | bc7f6ab041f1d7c4de003e93373ad6ed3aa47f87 (patch) | |
| tree | 2354e27a82fbb1734246026c2c40396db3bf0ed1 | |
| parent | a87939a39820d9190d2cd74be445e29951d0c6ad (diff) | |
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
| -rw-r--r-- | extraconfig/tasks/major_upgrade_compute.sh | 2 | ||||
| -rw-r--r-- | extraconfig/tasks/major_upgrade_object_storage.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_compute.sh b/extraconfig/tasks/major_upgrade_compute.sh index 78628c8c..a1df695f 100644 --- a/extraconfig/tasks/major_upgrade_compute.sh +++ b/extraconfig/tasks/major_upgrade_compute.sh @@ -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 diff --git a/extraconfig/tasks/major_upgrade_object_storage.sh b/extraconfig/tasks/major_upgrade_object_storage.sh index 931f4f42..f82457ce 100644 --- a/extraconfig/tasks/major_upgrade_object_storage.sh +++ b/extraconfig/tasks/major_upgrade_object_storage.sh @@ -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 |