summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-14 18:22:30 +0000
committerGerrit Code Review <review@openstack.org>2012-03-14 18:22:30 +0000
commitacc9f892b36aa7315ac84d1e7f6506a6fea9fbad (patch)
treeda3f8052d7bb96e4cb5e9ec2f80c2d99cdc7b7ed
parentb03c2047815ff341547d2d9792dfd392148d277a (diff)
parenta1e01747ea81fc128d08c02d449b477f52003680 (diff)
downloadkeystone-acc9f892b36aa7315ac84d1e7f6506a6fea9fbad.tar.gz
keystone-acc9f892b36aa7315ac84d1e7f6506a6fea9fbad.tar.xz
keystone-acc9f892b36aa7315ac84d1e7f6506a6fea9fbad.zip
Merge "Update docs for keystone client cli args"
-rw-r--r--doc/source/configuration.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 95b2e0ad..ad47d424 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -317,10 +317,10 @@ Authenticating with a Password
To administer a Keystone endpoint, the following user referenced below should
be granted the ``admin`` role.
-* ``--username OS_USERNAME``: Name of your user
-* ``--password OS_PASSWORD``: Password for your user
-* ``--tenant_name OS_TENANT_NAME``: Name of your tenant
-* ``--auth_url OS_AUTH_URL``: URL of your Keystone auth server, e.g.
+* ``--os_username OS_USERNAME``: Name of your user
+* ``--os_password OS_PASSWORD``: Password for your user
+* ``--os_tenant_name OS_TENANT_NAME``: Name of your tenant
+* ``--os_auth_url OS_AUTH_URL``: URL of your Keystone auth server, e.g.
``http://localhost:35357/v2.0``
You can also set these variables in your environment so that they do not need
@@ -356,8 +356,8 @@ provide additional (often optional) information. For example, the command
keystone tenant-create --name=demo
# Using user + password + tenant_name flags
- keystone --username=admin --password=secrete --tenant_name=admin user-list
- keystone --username=admin --password=secrete --tenant_name=admin tenant-create --name=demo
+ keystone --os_username=admin --os_password=secrete --os_tenant_name=admin user-list
+ keystone --os_username=admin --os_password=secrete --os_tenant_name=admin tenant-create --name=demo
Tenants
-------