openstack/devstack
Code Issues Proposed changes

Merge "Use volume v3 API in clouds.yaml by default"

Browse Source
This commit is contained in:
Zuul 2018-12-21 10:50:28 +00:00 committed by Gerrit Code Review
commit d0264bdcf4
2 changed files with 1 additions and 4 deletions

3
functions-common

@ -92,7 +92,6 @@ function write_clouds_yaml {
--file $CLOUDS_YAML \
--os-cloud devstack \
--os-region-name $REGION_NAME \
--os-identity-api-version 3 \
$CA_CERT_ARG \
--os-auth-url $KEYSTONE_SERVICE_URI \
--os-username demo \
@ -104,7 +103,6 @@ function write_clouds_yaml {
--file $CLOUDS_YAML \
--os-cloud devstack-alt \
--os-region-name $REGION_NAME \
--os-identity-api-version 3 \
$CA_CERT_ARG \
--os-auth-url $KEYSTONE_SERVICE_URI \
--os-username alt_demo \
@ -116,7 +114,6 @@ function write_clouds_yaml {
--file $CLOUDS_YAML \
--os-cloud devstack-admin \
--os-region-name $REGION_NAME \
--os-identity-api-version 3 \
$CA_CERT_ARG \
--os-auth-url $KEYSTONE_SERVICE_URI \
--os-username admin \

2
tools/update_clouds_yaml.py

@ -83,7 +83,7 @@ def main():
parser.add_argument('--os-cloud', required=True)
parser.add_argument('--os-region-name', default='RegionOne')
parser.add_argument('--os-identity-api-version', default='3')
parser.add_argument('--os-volume-api-version', default='2')
parser.add_argument('--os-volume-api-version', default='3')
parser.add_argument('--os-cacert')
parser.add_argument('--os-auth-url', required=True)
parser.add_argument('--os-username', required=True)