summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-02 20:38:34 +0000
committerGerrit Code Review <review@openstack.org>2018-06-02 20:38:34 +0000
commit35b99baf6e0da5b13fa72b50d7a20ff1944776de (patch)
treee909cf11233fa5ef06212e067737b4e95fd60b8c
parent4856c7fc6e0f67b31f1a33aba7da92477ce0f6c1 (diff)
parent4a9e9208ad7262e4e7a0eb1d37281dc5f5d8f7de (diff)
downloadpython-cinderclient-35b99baf6e0da5b13fa72b50d7a20ff1944776de.tar.gz
Merge "update the value of OS_AUTH_URL and OS_VOLUME_API_VERSION"3.6.0
-rw-r--r--doc/source/cli/index.rst4
-rw-r--r--doc/source/user/cinder.rst4
-rw-r--r--doc/source/user/shell.rst2
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/source/cli/index.rst b/doc/source/cli/index.rst
index 69bcd14..cdb39af 100644
--- a/doc/source/cli/index.rst
+++ b/doc/source/cli/index.rst
@@ -31,12 +31,12 @@ variables::
export OS_USERNAME=user
export OS_PASSWORD=pass
export OS_TENANT_NAME=myproject
- export OS_AUTH_URL=http://auth.example.com:5000/v2.0
+ export OS_AUTH_URL=http://auth.example.com:5000/v3
You can select an API version to use by `--os-volume-api-version` option or by
setting corresponding environment variable::
- export OS_VOLUME_API_VERSION=2
+ export OS_VOLUME_API_VERSION=3
OPTIONS
diff --git a/doc/source/user/cinder.rst b/doc/source/user/cinder.rst
index cad6611..ceebbba 100644
--- a/doc/source/user/cinder.rst
+++ b/doc/source/user/cinder.rst
@@ -31,12 +31,12 @@ variables::
export OS_USERNAME=user
export OS_PASSWORD=pass
export OS_TENANT_NAME=myproject
- export OS_AUTH_URL=http://auth.example.com:5000/v2.0
+ export OS_AUTH_URL=http://auth.example.com:5000/v3
You can select an API version to use by `--os-volume-api-version`
option or by setting corresponding environment variable::
- export OS_VOLUME_API_VERSION=2
+ export OS_VOLUME_API_VERSION=3
OPTIONS
diff --git a/doc/source/user/shell.rst b/doc/source/user/shell.rst
index 3bd2f1f..0d03b01 100644
--- a/doc/source/user/shell.rst
+++ b/doc/source/user/shell.rst
@@ -37,7 +37,7 @@ For example, in Bash you'd use::
export OS_USERNAME=yourname
export OS_PASSWORD=yadayadayada
export OS_TENANT_NAME=myproject
- export OS_AUTH_URL=http://auth.example.com:5000/v2.0
+ export OS_AUTH_URL=http://auth.example.com:5000/v3
export OS_VOLUME_API_VERSION=3
From there, all shell commands take the form::