From 1576b73507541c996b9c1a8d83279cb2ed5ddd92 Mon Sep 17 00:00:00 2001 From: Jeremy Liu Date: Thu, 27 Oct 2016 10:55:00 +0800 Subject: [PATCH] Fix error in doc Change-Id: Ica60978fe06a19df69f232614fcca3a7856d7d44 --- clientrc | 9 +++++---- doc/source/authentication.rst | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/clientrc b/clientrc index 1d6be263..abd56226 100644 --- a/clientrc +++ b/clientrc @@ -1,16 +1,17 @@ export OS_PROJECT_NAME= -# Either Project ID or Project Name is required -export OS_PROJECT_DOMAIN_ID= -export OS_PROJECT_DOMAIN_NAME= +# Either Project Domain ID or Project Domain Name is required +export OS_PROJECT_DOMAIN_ID= +export OS_PROJECT_DOMAIN_NAME= -# 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= export OS_USER_DOMAIN_NAME= # Either User ID or Username can be used export OS_USER_ID = export OS_USERNAME= + export OS_PASSWORD= # OS_AUTH_URL should be your location of Keystone diff --git a/doc/source/authentication.rst b/doc/source/authentication.rst index 10325537..4cc7f5b9 100644 --- a/doc/source/authentication.rst +++ b/doc/source/authentication.rst @@ -93,22 +93,26 @@ directory. .. code-block:: bash - export OS_PROJECT_NAME=admin + export OS_PROJECT_NAME= - # Either Project ID or Project Name is required - export OS_PROJECT_DOMAIN_ID= - export OS_PROJECT_DOMAIN_NAME= + # Either Project Domain ID or Project Domain Name is required + export OS_PROJECT_DOMAIN_ID= + export OS_PROJECT_DOMAIN_NAME= - # Either User ID or User Name is required + # Either User Domain ID or User Domain Name is required export OS_USER_DOMAIN_ID= export OS_USER_DOMAIN_NAME= - export OS_USERNAME=admin - export OS_PASSWORD=password + + # Either User ID or Username can be used + export OS_USER_ID = + export OS_USERNAME= + + export OS_PASSWORD= # 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=":5000/v3/" + export BARBICAN_ENDPOINT=":9311" Make any appropriate changes to this file.