diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-02 16:55:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-02 16:55:24 +0000 |
| commit | dff006c3f686c63c4197b5ce66261f448e0580db (patch) | |
| tree | ec717a7b9f76990f03812b2a90ab42408c2b4708 /openstackclient/shell.py | |
| parent | c02b816a74ec1f7442f71c6c289b33248352e86f (diff) | |
| parent | a05cbf4c998678a3619d82dd49be2b7759373d60 (diff) | |
| download | python-openstackclient-dff006c3f686c63c4197b5ce66261f448e0580db.tar.gz | |
Merge "Rework shell tests"
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py index e6181683..136542dc 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -182,6 +182,7 @@ class OpenStackShell(app.App): parser.add_argument( '--os-cacert', metavar='<ca-bundle-file>', + dest='cacert', default=utils.env('OS_CACERT'), help='CA certificate bundle file (Env: OS_CACERT)') verify_group = parser.add_mutually_exclusive_group() @@ -200,6 +201,7 @@ class OpenStackShell(app.App): parser.add_argument( '--os-default-domain', metavar='<auth-domain>', + dest='default_domain', default=utils.env( 'OS_DEFAULT_DOMAIN', default=DEFAULT_DOMAIN), @@ -270,7 +272,7 @@ class OpenStackShell(app.App): self.verify = self.cloud.config.get('verify', self.verify) # Save default domain - self.default_domain = self.options.os_default_domain + self.default_domain = self.options.default_domain # Loop through extensions to get API versions for mod in clientmanager.PLUGIN_MODULES: |