diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index c886009b..55b2122a 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -78,6 +78,7 @@ function destroy {
     barbican secret delete $(resource_get barbican secret_link)
     local user_id=$(resource_get barbican user_id)
     local project_id=$(resource_get barbican project_id)
+    source $TOP_DIR/openrc admin admin
     openstack user delete $user_id
     openstack project delete $project_id
 }
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 29c2b6e4..8bc2184d 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 # shutdown barbican service
-set -o errexit
 
 source $GRENADE_DIR/grenaderc
 source $GRENADE_DIR/functions