diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-18 14:46:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-18 14:46:23 +0000 |
| commit | a4109cc3bfb41be47f23f83ef967d5fbc82913f9 (patch) | |
| tree | 07000d23730247e64a540ac17e23c89668cb7ebd /cinderclient/shell.py | |
| parent | 9f3c8952a169141cc2c741791c7196d926a3313b (diff) | |
| parent | 80d3edc71e2c746c692f2a8f9aecd3dee4429dab (diff) | |
| download | python-cinderclient-a4109cc3bfb41be47f23f83ef967d5fbc82913f9.tar.gz | |
Merge "Support --os-key option"
Diffstat (limited to 'cinderclient/shell.py')
| -rw-r--r-- | cinderclient/shell.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 0d4ee72..9b9513e 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -802,6 +802,9 @@ class OpenStackCinderShell(object): # first create a Keystone session cacert = self.options.os_cacert or None cert = self.options.os_cert or None + if cert and self.options.os_key: + cert = cert, self.options.os_key + insecure = self.options.insecure or False if insecure: |