From cb93689b9b1204c09660d74e216eb056b3091385 Mon Sep 17 00:00:00 2001 From: Feodor Tersin Date: Sat, 5 Sep 2015 09:24:59 +0300 Subject: [PATCH] Fix devstack plugin script Specify auth version for delete endpoint and service operations. Also remove v2.0 from keystone url to allow discovery of auth method in Nova CLI. Change-Id: Ibfab462b89bc45f9acf9337be54d92d9be48e846 --- devstack/plugin.sh | 4 ++-- ec2api/tests/contrib/post_test_hook.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3972216c..9c526f2b 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -56,14 +56,14 @@ function recreate_endpoint { --service "$endpoint" --region "$REGION_NAME" -c ID -f value) if [[ -n "$endpoint_ids" ]]; then for endpoint_id in $endpoint_ids ; do - openstack endpoint delete $endpoint_id + openstack --os-identity-api-version 3 endpoint delete $endpoint_id done fi local service_id=$(openstack --os-identity-api-version 3 service list \ -c "ID" -c "Name" \ | grep " $endpoint " | get_field 1) if [[ -n "$service_id" ]]; then - openstack service delete $service_id + openstack --os-identity-api-version 3 service delete $service_id fi local service_id=$(openstack service create \ diff --git a/ec2api/tests/contrib/post_test_hook.sh b/ec2api/tests/contrib/post_test_hook.sh index 15f85e45..2c71fb29 100755 --- a/ec2api/tests/contrib/post_test_hook.sh +++ b/ec2api/tests/contrib/post_test_hook.sh @@ -29,6 +29,8 @@ OLD_OS_PASSWORD=$OS_PASSWORD # bug somewhere unset OS_AUTH_TYPE +# remove v2.0 from OS_AUTH_URL +export OS_AUTH_URL=$(echo $OS_AUTH_URL | sed -r "s#(.*\/).*#\1#") if [[ ! -f $TEST_CONFIG_DIR/$TEST_CONFIG ]]; then