openstack/devstack
Code Issues Proposed changes

Merge "Remove wrong paramter COMPUTE_API_VERSION"

Browse Source
This commit is contained in:
Jenkins 2015-11-05 22:04:12 +00:00 committed by Gerrit Code Review
commit efd86cd6e8
3 changed files with 0 additions and 11 deletions

1
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

4
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

6
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}