diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2013-04-04 15:03:57 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-04-04 15:41:22 -0500 |
| commit | fab61c8275893c7ab7279336b9d64d1154264059 (patch) | |
| tree | 3b744b9beb10e34b648845ce704cf0f290c490a8 /bin | |
| parent | 8ea9c4aae8837842a54f513866521d0d473d781f (diff) | |
| download | python-swiftclient-fab61c8275893c7ab7279336b9d64d1154264059.tar.gz | |
Improve auth option help
Add to the help strings to clarify the need for --os-auth-token to
also have --os-storage-url supplied.
Change-Id: I6a7259c38ce01813ae96f307efaf46e7863bd223
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/swift | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -1095,8 +1095,15 @@ Commands: %(st_download_help)s %(st_delete_help)s -Example: +Examples: %%prog -A https://auth.api.rackspacecloud.com/v1.0 -U user -K key stat + + %%prog --os-auth-url https://api.example.com/v2.0 --os-tenant-name tenant \\ + --os-usernameuser --os-password password list + + %%prog --os-auth-token 6ee5eb33efad4e45ab46806eac010566 \\ + --os-storage-url https://10.1.5.2:8080/v1/AUTH_ced809b6a4baea7aeab61a \\ + list '''.strip('\n') % globals()) parser.add_option('-s', '--snet', action='store_true', dest='snet', default=False, help='Use SERVICENET internal network') @@ -1157,14 +1164,18 @@ Example: parser.add_option('--os-auth-token', metavar='<auth-token>', default=environ.get('OS_AUTH_TOKEN'), - help='Openstack token. Defaults to env[OS_AUTH_TOKEN]') + help='Openstack token. Defaults to env[OS_AUTH_TOKEN]. ' + 'Used with --os-storage-url to bypass the ' + 'usual username/password authentication.') parser.add_option('--os_auth_token', help=SUPPRESS_HELP) parser.add_option('--os-storage-url', metavar='<storage-url>', default=environ.get('OS_STORAGE_URL'), help='Openstack storage URL. ' - 'Defaults to env[OS_STORAGE_URL]') + 'Defaults to env[OS_STORAGE_URL]. ' + 'Used with --os-auth-token to bypass the ' + 'usual username/password authentication.') parser.add_option('--os_storage_url', help=SUPPRESS_HELP) parser.add_option('--os-region-name', |