Merge "Fix bug in barbican-plugin-grenade"

This commit is contained in:
Jenkins 2017-05-18 14:30:39 +00:00 committed by Gerrit Code Review
commit 1251948699
2 changed files with 1 additions and 1 deletions

View File

@ -78,6 +78,7 @@ function destroy {
barbican secret delete $(resource_get barbican secret_link) barbican secret delete $(resource_get barbican secret_link)
local user_id=$(resource_get barbican user_id) local user_id=$(resource_get barbican user_id)
local project_id=$(resource_get barbican project_id) local project_id=$(resource_get barbican project_id)
source $TOP_DIR/openrc admin admin
openstack user delete $user_id openstack user delete $user_id
openstack project delete $project_id openstack project delete $project_id
} }

View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# shutdown barbican service # shutdown barbican service
set -o errexit
source $GRENADE_DIR/grenaderc source $GRENADE_DIR/grenaderc
source $GRENADE_DIR/functions source $GRENADE_DIR/functions