From e37f5014a403f35feba413f4dae3c877047cf877 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Hoai Date: Tue, 4 Apr 2017 17:02:58 +0700 Subject: [PATCH] Fix bug in barbican-plugin-grenade There are two bugs during implement blueprint support-upgrade. Change-Id: Ic4c20a830a06d7fee4d186e182c45ed7cb457233 Closes-Bug: #1678967 Depends-On: I9d8c64217d622fd36bf8a8e5cd2f89aecc358fb9 Partially-Implements: blueprint support-upgrade --- devstack/upgrade/resources.sh | 1 + devstack/upgrade/shutdown.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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