diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-08 12:12:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-08 12:12:43 +0000 |
| commit | 63906456f655feb76a94bfe8384ae974473ef8be (patch) | |
| tree | 3020eb6212581aa910d3f313cc83fdd2e02dff92 | |
| parent | 94340b624ac5713e12c01013cf5b668256a2d0e8 (diff) | |
| parent | 1576b73507541c996b9c1a8d83279cb2ed5ddd92 (diff) | |
| download | python-barbicanclient-63906456f655feb76a94bfe8384ae974473ef8be.tar.gz | |
Merge "Fix error in doc"
| -rw-r--r-- | clientrc | 9 | ||||
| -rw-r--r-- | doc/source/authentication.rst | 22 |
2 files changed, 18 insertions, 13 deletions
@@ -1,16 +1,17 @@ export OS_PROJECT_NAME=<YourProjectName> -# Either Project ID or Project Name is required -export OS_PROJECT_DOMAIN_ID=<YourProjectID> -export OS_PROJECT_DOMAIN_NAME=<YourProjectName> +# Either Project Domain ID or Project Domain Name is required +export OS_PROJECT_DOMAIN_ID=<YourProjectDomainID> +export OS_PROJECT_DOMAIN_NAME=<YourProjectDomainName> -# Either Domain User ID or Domain User Name is required +# Either User Domain ID or User Domain Name is required export OS_USER_DOMAIN_ID=<YourUserDomainID> export OS_USER_DOMAIN_NAME=<YourUserDomainName> # Either User ID or Username can be used export OS_USER_ID =<YourUserID> export OS_USERNAME=<YourUserName> + export OS_PASSWORD=<YourPassword> # OS_AUTH_URL should be your location of Keystone diff --git a/doc/source/authentication.rst b/doc/source/authentication.rst index 3b59dd9..cb2dbea 100644 --- a/doc/source/authentication.rst +++ b/doc/source/authentication.rst @@ -99,22 +99,26 @@ directory. .. code-block:: bash - export OS_PROJECT_NAME=admin + export OS_PROJECT_NAME=<YourProjectName> - # Either Project ID or Project Name is required - export OS_PROJECT_DOMAIN_ID=<YourProjectID> - export OS_PROJECT_DOMAIN_NAME=<YourProjectName> + # Either Project Domain ID or Project Domain Name is required + export OS_PROJECT_DOMAIN_ID=<YourProjectDomainID> + export OS_PROJECT_DOMAIN_NAME=<YourProjectDomainName> - # Either User ID or User Name is required + # Either User Domain ID or User Domain Name is required export OS_USER_DOMAIN_ID=<YourUserDomainID> export OS_USER_DOMAIN_NAME=<YourUserDomainName> - export OS_USERNAME=admin - export OS_PASSWORD=password + + # Either User ID or Username can be used + export OS_USER_ID =<YourUserID> + export OS_USERNAME=<YourUserName> + + export OS_PASSWORD=<YourPassword> # OS_AUTH_URL should be your location of Keystone # Barbican Client defaults to Keystone V3 - export OS_AUTH_URL="http://localhost:5000/v3/" - export BARBICAN_ENDPOINT="http://localhost:9311" + export OS_AUTH_URL="<YourAuthURL>:5000/v3/" + export BARBICAN_ENDPOINT="<YourBarbicanEndpoint>:9311" Make any appropriate changes to this file. |