diff --git a/exercises/client-args.sh b/exercises/client-args.sh index c33ef44e9a..7cfef1c807 100755 --- a/exercises/client-args.sh +++ b/exercises/client-args.sh @@ -41,7 +41,6 @@ unset NOVA_PROJECT_ID unset NOVA_REGION_NAME unset NOVA_URL unset NOVA_USERNAME -unset NOVA_VERSION # Save the known variables for later export x_TENANT_NAME=$OS_TENANT_NAME diff --git a/exercises/client-env.sh b/exercises/client-env.sh index 4a0609a944..1d2f4f5689 100755 --- a/exercises/client-env.sh +++ b/exercises/client-env.sh @@ -41,7 +41,6 @@ unset NOVA_PROJECT_ID unset NOVA_REGION_NAME unset NOVA_URL unset NOVA_USERNAME -unset NOVA_VERSION for i in OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_AUTH_URL; do is_set $i @@ -101,9 +100,6 @@ if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then STATUS_EC2="Failed" RETURN=1 fi - - # Clean up side effects - unset NOVA_VERSION fi fi diff --git a/openrc b/openrc index 71ba5a6ea5..9bc0fd77f4 100644 --- a/openrc +++ b/openrc @@ -95,12 +95,6 @@ if [[ ! -v OS_CACERT ]] ; then fi fi -# Currently novaclient needs you to specify the *compute api* version. This -# needs to match the config of your catalog returned by Keystone. -export NOVA_VERSION=${NOVA_VERSION:-1.1} -# In the future this will change names: -export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION} - # Currently cinderclient needs you to specify the *volume api* version. This # needs to match the config of your catalog returned by Keystone. export CINDER_VERSION=${CINDER_VERSION:-2}