openstack/osc-lib
Code Issues Proposed changes

Merge "Pass ssl values through to OCC"

Browse Source
This commit is contained in:
Jenkins
2017-03-23 13:49:09 +00:00
committed by Gerrit Code Review
parent 2a3881db53 640c3ce869
commit fdf9f0cd66
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osc_lib/clientmanager.py
View File

@@ -127,6 +127,22 @@ class ClientManager(object):
if self.cert and self._cli_options.key: if self.cert and self._cli_options.key:
self.cert = self.cert, self._cli_options.key self.cert = self.cert, self._cli_options.key
# TODO(mordred) The logic above to set all of these is duplicated in
# os-client-config but needs more effort to tease apart and ensure that
# values are being passed in. For now, let osc_lib do it and just set
# the values in occ.config
self._cli_options.config['verify'] = self.verify
self._cli_options.config['cacert'] = self.cacert
# Attack of the killer passthrough values
self._cli_options.config['cert'] = self._cli_options.cert
self._cli_options.config['key'] = self._cli_options.key
# TODO(mordred) We also don't have any support for setting or passing
# in api_timeout, which is set in occ defaults but we skip occ defaults
# so set it here by hand and later we should potentially expose this
# directly to osc
self._cli_options.config['api_timeout'] = None
# Get logging from root logger # Get logging from root logger
root_logger = logging.getLogger('') root_logger = logging.getLogger('')
LOG.setLevel(root_logger.getEffectiveLevel()) LOG.setLevel(root_logger.getEffectiveLevel())