Merge "Discrepancy between README.rst and cinder help"

This commit is contained in:
Jenkins 2013-12-17 07:14:51 +00:00 committed by Gerrit Code Review
commit a2b9bdd36c
2 changed files with 4 additions and 3 deletions

View File

@ -44,13 +44,13 @@ params, but it's easier to just set them as environment variables::
export OS_TENANT_NAME=myproject
You will also need to define the authentication url with ``--os-auth-url``
and the version of the API with ``--version``. Or set them as an environment
variables as well::
and the version of the API with ``--os-volume-api-version``. Or set them as
environment variables as well::
export OS_AUTH_URL=http://example.com:8774/v1.1/
export OS_VOLUME_API_VERSION=1
If you are using Keystone, you need to set the CINDER_URL to the keystone
If you are using Keystone, you need to set the OS_AUTH_URL to the keystone
endpoint::
export OS_AUTH_URL=http://example.com:5000/v2.0/

View File

@ -38,6 +38,7 @@ MASTER
.. _1253142: http://bugs.launchpad.net/python-cinderclient/+bug/1253142
.. _1252665: http://bugs.launchpad.net/python-cinderclient/+bug/1252665
.. _1255876: http://bugs.launchpad.net/python-cinderclient/+bug/1255876
.. _1251385: http://bugs.launchpad.net/python-cinderclient/+bug/1251385
1.0.7
-----