summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-22 09:52:37 +0000
committerGerrit Code Review <review@openstack.org>2016-09-22 09:52:37 +0000
commit75c20d5b5dabed936f86096829377b01f1c3d4b2 (patch)
tree32a0fa0c799dbec415117d20fb1e621440ed4d59
parenta3dd85c2bfdb97a72b150b51dd6cac85c597a714 (diff)
parentbc7f6ab041f1d7c4de003e93373ad6ed3aa47f87 (diff)
Merge "Make sure major upgrade script fails."
-rw-r--r--extraconfig/tasks/major_upgrade_compute.sh2
-rw-r--r--extraconfig/tasks/major_upgrade_object_storage.sh1
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