Browse code
Remove wrong paramter COMPUTE_API_VERSION
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
Andrey Kurilin authored on 2015/10/30 23:24:19Showing 3 changed files
| ... | ... |
@@ -41,7 +41,6 @@ unset NOVA_PROJECT_ID |
| 41 | 41 |
unset NOVA_REGION_NAME |
| 42 | 42 |
unset NOVA_URL |
| 43 | 43 |
unset NOVA_USERNAME |
| 44 |
-unset NOVA_VERSION |
|
| 45 | 44 |
|
| 46 | 45 |
for i in OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_AUTH_URL; do |
| 47 | 46 |
is_set $i |
| ... | ... |
@@ -101,9 +100,6 @@ if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then |
| 101 | 101 |
STATUS_EC2="Failed" |
| 102 | 102 |
RETURN=1 |
| 103 | 103 |
fi |
| 104 |
- |
|
| 105 |
- # Clean up side effects |
|
| 106 |
- unset NOVA_VERSION |
|
| 107 | 104 |
fi |
| 108 | 105 |
fi |
| 109 | 106 |
|
| ... | ... |
@@ -95,12 +95,6 @@ if [[ ! -v OS_CACERT ]] ; then |
| 95 | 95 |
fi |
| 96 | 96 |
fi |
| 97 | 97 |
|
| 98 |
-# Currently novaclient needs you to specify the *compute api* version. This |
|
| 99 |
-# needs to match the config of your catalog returned by Keystone. |
|
| 100 |
-export NOVA_VERSION=${NOVA_VERSION:-1.1}
|
|
| 101 |
-# In the future this will change names: |
|
| 102 |
-export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION}
|
|
| 103 |
- |
|
| 104 | 98 |
# Currently cinderclient needs you to specify the *volume api* version. This |
| 105 | 99 |
# needs to match the config of your catalog returned by Keystone. |
| 106 | 100 |
export CINDER_VERSION=${CINDER_VERSION:-2}
|