1. devstack
  2. Commit e0b375c8ce77ca256d108b2c558d57e17efab4f7
Browse code

Use volume v3 API in clouds.yaml by default

Volume API v2 has been deprecated for a long time.
There is no reason to use volume v2 in clouds.yaml by default.

This commit also drops "--os-identity-api-version 3" from
write_clouds_yaml in functions -common as "3" is the default value
of tools/update_clouds_yaml.py. They are hardcoded in DevStack
so there is no reason to pass it.

Change-Id: Ie84026a3d19f7711fc781b7012355096c7ff6b5a

Akihiro Motoki authored on 2018/12/14 17:29:27
Showing 2 changed files
functions-common
History View file @ e0b375c
... ... 
@@ -92,7 +92,6 @@ function write_clouds_yaml {
92 92 
         --file $CLOUDS_YAML \
93 93 
         --os-cloud devstack \
94 94 
         --os-region-name $REGION_NAME \
95 
-        --os-identity-api-version 3 \
96 95 
         $CA_CERT_ARG \
97 96 
         --os-auth-url $KEYSTONE_SERVICE_URI \
98 97 
         --os-username demo \
... ... 
@@ -104,7 +103,6 @@ function write_clouds_yaml {
104 104 
         --file $CLOUDS_YAML \
105 105 
         --os-cloud devstack-alt \
106 106 
         --os-region-name $REGION_NAME \
107 
-        --os-identity-api-version 3 \
108 107 
         $CA_CERT_ARG \
109 108 
         --os-auth-url $KEYSTONE_SERVICE_URI \
110 109 
         --os-username alt_demo \
... ... 
@@ -116,7 +114,6 @@ function write_clouds_yaml {
116 116 
         --file $CLOUDS_YAML \
117 117 
         --os-cloud devstack-admin \
118 118 
         --os-region-name $REGION_NAME \
119 
-        --os-identity-api-version 3 \
120 119 
         $CA_CERT_ARG \
121 120 
         --os-auth-url $KEYSTONE_SERVICE_URI \
122 121 
         --os-username admin \
tools/update_clouds_yaml.py
History View file @ e0b375c
... ... 
@@ -83,7 +83,7 @@ def main():
83 83 
     parser.add_argument('--os-cloud', required=True)
84 84 
     parser.add_argument('--os-region-name', default='RegionOne')
85 85 
     parser.add_argument('--os-identity-api-version', default='3')
86 
-    parser.add_argument('--os-volume-api-version', default='2')
86 
+    parser.add_argument('--os-volume-api-version', default='3')
87 87 
     parser.add_argument('--os-cacert')
88 88 
     parser.add_argument('--os-auth-url', required=True)
89 89 
     parser.add_argument('--os-username', required=True)