From c4093ec56edb7d14afc7e55d558e1b4796a975ee Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Sun, 19 Feb 2012 04:32:26 -0800 Subject: Move --version to --identity_api_version * Default to OS_IDENTITY_API_VERSION before KEYSTONE_VERSION * Copy in 'env' function from python-novaclient hat supports multiple env var names * Fixes bug 936162 Change-Id: I3b4013408465ea45788517cb31afb7fc652e6e95 --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index e47c657..9f26cf9 100644 --- a/README.rst +++ b/README.rst @@ -82,8 +82,9 @@ You'll find complete documentation on the shell by running --password PASSWORD Defaults to env[OS_PASSWORD]. --tenant_name TENANT_NAME Defaults to env[OS_TENANT_NAME]. --tenant_id TENANT_ID Defaults to env[OS_TENANT_ID]. - --url AUTH_URL Defaults to env[OS_AUTH_URL] or - --version VERSION Defaults to env[KEYSTONE_VERSION] or 2.0. + --url AUTH_URL Defaults to env[OS_AUTH_URL]. + --identity_api_version IDENTITY_API_VERSION + Defaults to env[OS_IDENTITY_API_VERSION] or 2.0. --region_name NAME The region name in the Keystone Service Catalog to use after authentication. Defaults to env[KEYSTONE_REGION_NAME] or the -- cgit v1.2.1