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

@@ -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 \

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