openstack/python-cinderclient
Code Issues Proposed changes

Merge "Use shared shell arguments provided by Session"

Browse Source
This commit is contained in:
Jenkins
2015-07-16 22:03:34 +00:00
committed by Gerrit Code Review
parent 075381d0aa 891ef3e71e
commit 159783743e
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cinderclient/shell.py
View File

@@ -360,18 +360,6 @@ class OpenStackCinderShell(object):
default=utils.env('OS_PROJECT_DOMAIN_NAME'), default=utils.env('OS_PROJECT_DOMAIN_NAME'),
help='Defaults to env[OS_PROJECT_DOMAIN_NAME].') help='Defaults to env[OS_PROJECT_DOMAIN_NAME].')
parser.add_argument(
'--os-cert',
metavar='<certificate>',
default=utils.env('OS_CERT'),
help='Defaults to env[OS_CERT].')
parser.add_argument(
'--os-key',
metavar='<key>',
default=utils.env('OS_KEY'),
help='Defaults to env[OS_KEY].')
parser.add_argument('--os-region-name', parser.add_argument('--os-region-name',
metavar='<region-name>', metavar='<region-name>',
default=utils.env('OS_REGION_NAME', default=utils.env('OS_REGION_NAME',
@@ -397,19 +385,10 @@ class OpenStackCinderShell(object):
'--os_url', '--os_url',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument( # Register the CLI arguments that have moved to the session object.
'--os-cacert', session.Session.register_cli_options(parser)
metavar='<ca-certificate>', parser.set_defaults(insecure=utils.env('CINDERCLIENT_INSECURE',
default=utils.env('OS_CACERT', default=None), default=False))
help=_("Specify a CA bundle file to use in "
"verifying a TLS (https) server certificate. "
"Defaults to env[OS_CACERT]"))
parser.add_argument('--insecure',
default=utils.env('CINDERCLIENT_INSECURE',
default=False),
action='store_true',
help=argparse.SUPPRESS)
def get_subcommand_parser(self, version): def get_subcommand_parser(self, version):
parser = self.get_base_parser() parser = self.get_base_parser()