Merge "show option per line"

This commit is contained in:
Zuul
2018-06-05 17:42:23 +00:00
committed by Gerrit Code Review

View File

@@ -1483,7 +1483,8 @@ def main(arguments=None):
--os-identity-api-version <auth_version> ] --os-identity-api-version <auth_version> ]
[--user <username>] [--user <username>]
[--key <api_key>] [--retries <num_retries>] [--key <api_key>] [--retries <num_retries>]
[--os-username <auth-user-name>] [--os-password <auth-password>] [--os-username <auth-user-name>]
[--os-password <auth-password>]
[--os-user-id <auth-user-id>] [--os-user-id <auth-user-id>]
[--os-user-domain-id <auth-user-domain-id>] [--os-user-domain-id <auth-user-domain-id>]
[--os-user-domain-name <auth-user-domain-name>] [--os-user-domain-name <auth-user-domain-name>]
@@ -1493,11 +1494,14 @@ def main(arguments=None):
[--os-project-name <auth-project-name>] [--os-project-name <auth-project-name>]
[--os-project-domain-id <auth-project-domain-id>] [--os-project-domain-id <auth-project-domain-id>]
[--os-project-domain-name <auth-project-domain-name>] [--os-project-domain-name <auth-project-domain-name>]
[--os-auth-url <auth-url>] [--os-auth-token <auth-token>] [--os-auth-url <auth-url>]
[--os-storage-url <storage-url>] [--os-region-name <region-name>] [--os-auth-token <auth-token>]
[--os-storage-url <storage-url>]
[--os-region-name <region-name>]
[--os-service-type <service-type>] [--os-service-type <service-type>]
[--os-endpoint-type <endpoint-type>] [--os-endpoint-type <endpoint-type>]
[--os-cacert <ca-certificate>] [--insecure] [--os-cacert <ca-certificate>]
[--insecure]
[--os-cert <client-certificate-file>] [--os-cert <client-certificate-file>]
[--os-key <client-certificate-key-file>] [--os-key <client-certificate-key-file>]
[--no-ssl-compression] [--no-ssl-compression]