summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-21 08:11:02 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-08-21 08:13:47 -0500
commit708889488f1f949c909ba023b1689cc967d73318 (patch)
tree986f3f4e336d08921a205cedda0d246911665c3f
parent232992676a3a5bff9d4e3e98c42fd1b5c6d6d578 (diff)
try to match the admin-openrc as per functest latest.
Change-Id: Ib2674038f82ae2825544149b7b88ee5ba8cb7d22 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/openstack.sh25
1 files changed, 7 insertions, 18 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 98ebb145..c54416cb 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -130,28 +130,17 @@ EOF
configOpenrc() {
cat <<-EOF
-export OS_NO_CACHE='true'
+#export OS_NO_CACHE='true'
+export OS_AUTH_URL=$4
+export OS_USER_DOMAIN_NAME=admin_domain
+export OS_PROJECT_DOMAIN_NAME=admin_domain
+export OS_USERNAME=$1
export OS_TENANT_NAME=$3
-#export OS_TENANT_ID=$7
export OS_PROJECT_NAME=$3
-export OS_USERNAME=$1
export OS_PASSWORD=$2
+export OS_VOLUME_API_VERSION=2
export OS_IDENTITY_API_VERSION=3
-export OS_DEFAULT_DOMAIN=admin_domain
-export OS_USER_DOMAIN_NAME=admin_domain
-export OS_USER_DOMAIN_ID=$9
-export OS_PROJECT_DOMAIN_NAME=admin_domain
-export OS_PROJECT_DOMAIN_ID=$8
-export OS_AUTH_STRATEGY='keystone'
-export OS_REGION_NAME=$5
-export CINDER_ENDPOINT_TYPE=$6
-export GLANCE_ENDPOINT_TYPE=$6
-export KEYSTONE_ENDPOINT_TYPE=$6
-export NOVA_ENDPOINT_TYPE=$6
-export NEUTRON_ENDPOINT_TYPE=$6
-export OS_ENDPOINT_TYPE=$6
-export OS_INTERFACE=public
-export OS_AUTH_URL=$4
+export OS_IMAGE_API_VERSION=2
EOF
}