diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-04 00:44:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-04 00:44:51 +0000 |
| commit | 7f59fa594359376caf9a8490e45cd4f8bb0ead55 (patch) | |
| tree | 3cbe3266d797b818d8fab9c438bcdcbc38f5a942 /doc | |
| parent | e43c0f2b9b8b1e75959179646c212fdaf3d00265 (diff) | |
| parent | 5672c688d1cc7cdc064510daa6251d39edbf3033 (diff) | |
| download | python-openstackclient-7f59fa594359376caf9a8490e45cd4f8bb0ead55.tar.gz | |
Merge "trust authentication"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/man/openstack.rst | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/source/man/openstack.rst b/doc/source/man/openstack.rst index 16f0bc47..1023c603 100644 --- a/doc/source/man/openstack.rst +++ b/doc/source/man/openstack.rst @@ -83,6 +83,8 @@ OPTIONS :option:`--os-XXXX-api-version` <XXXX-api-version> Additional API version options will be available depending on the installed API libraries. +:option:`--os-trust-id` <trust-id> + id of the trust to use as a trustee user COMMANDS ======== @@ -181,21 +183,23 @@ The following environment variables can be set to alter the behaviour of :progra :envvar:`OS_CACERT` CA certificate bundle file -:envvar:`OS_COMPUTE_API_VERISON` +:envvar:`OS_COMPUTE_API_VERSION` Compute API version (Default: 2) -:envvar:`OS_IDENTITY_API_VERISON` +:envvar:`OS_IDENTITY_API_VERSION` Identity API version (Default: 2.0) -:envvar:`OS_IMAGE_API_VERISON` +:envvar:`OS_IMAGE_API_VERSION` Image API version (Default: 1) -:envvar:`OS_VOLUME_API_VERISON` +:envvar:`OS_VOLUME_API_VERSION` Volume API version (Default: 1) -:envvar:`OS_XXXX_API_VERISON` +:envvar:`OS_XXXX_API_VERSION` Additional API version options will be available depending on the installed API libraries. +:envvar:`OS_TRUST_ID` + id of the trust to use as a trustee user BUGS ==== |