openstack/devstack
Code Issues Proposed changes

Remove wrong paramter COMPUTE_API_VERSION

Browse Source 
Since:
 - novaclient doesn't require specify the *compute api* version
  (default is 2.latest now)
 - novaclient doesn't use COMPUTE_API_VERSION, since it's wrong name(
   OS_COMPUTE_API_VERSION is a correct name)

we can remove COMPUTE_API_VERSION and NOVA_VERSION vars

Change-Id: I47856863e9403870b8d60c778b97d3de1a212ae1
This commit is contained in:
Andrey Kurilin 2015-10-30 16:24:19 +02:00
parent a9e92c225c
commit 55a1bca282
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exercises/client-args.sh
View File

@ -41,7 +41,6 @@ unset NOVA_PROJECT_ID
unset NOVA_REGION_NAME unset NOVA_REGION_NAME
unset NOVA_URL unset NOVA_URL
unset NOVA_USERNAME unset NOVA_USERNAME
unset NOVA_VERSION
# Save the known variables for later # Save the known variables for later
export x_TENANT_NAME=$OS_TENANT_NAME export x_TENANT_NAME=$OS_TENANT_NAME

4
exercises/client-env.sh
View File

@ -41,7 +41,6 @@ unset NOVA_PROJECT_ID
unset NOVA_REGION_NAME unset NOVA_REGION_NAME
unset NOVA_URL unset NOVA_URL
unset NOVA_USERNAME unset NOVA_USERNAME
unset NOVA_VERSION
for i in OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_AUTH_URL; do for i in OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_AUTH_URL; do
is_set $i is_set $i
@ -101,9 +100,6 @@ if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
STATUS_EC2="Failed" STATUS_EC2="Failed"
RETURN=1 RETURN=1
fi fi
# Clean up side effects
unset NOVA_VERSION
fi fi
fi fi

6
openrc
View File

@ -95,12 +95,6 @@ if [[ ! -v OS_CACERT ]] ; then
fi fi
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 # Currently cinderclient needs you to specify the *volume api* version. This
# needs to match the config of your catalog returned by Keystone. # needs to match the config of your catalog returned by Keystone.
export CINDER_VERSION=${CINDER_VERSION:-2} export CINDER_VERSION=${CINDER_VERSION:-2}