openstack
/
shade
Code Issues Proposed changes

Use os-client-config SSL arg processing 

This logic was added to occ, so use it from there.

Change-Id: Icc224128ee397cdb50ee01fc75568a5207b8dbf7
This commit is contained in:
Monty Taylor 2015-06-03 18:52:57 -04:00
parent b09d65475a
commit 856b298175
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -3,7 +3,7 @@ pbr>=0.11,<2.0
bunch
decorator
jsonpatch
os-client-config>=1.2.0
os-client-config>=1.3.0
six
python-novaclient>=2.21.0

20
shade/__init__.py
View File

@ -150,16 +150,6 @@ def operator_cloud(debug=False, **kwargs):
**cloud_config.config)
def _ssl_args(verify, cacert, cert, key):
if cacert:
verify = cacert
if cert:
if key:
cert = (cert, key)
return (verify, cert)
def _get_service_values(kwargs, service_key):
# get defauts returns a copy of the defaults dict
values = os_client_config.defaults.get_defaults()
@ -279,11 +269,13 @@ class OpenStackCloud(object):
if cloud_config is None:
config = os_client_config.OpenStackConfig()
ssl_args = dict(
verify=verify, cacert=cacert, cert=cert, key=key,
)
if cloud in config.get_cloud_names():
cloud_config = config.get_one_cloud(cloud)
cloud_config = config.get_one_cloud(cloud, **ssl_args)
else:
cloud_config = config.get_one_cloud()
cloud_config = config.get_one_cloud(**ssl_args)
self.name = cloud
self.auth = auth
self.region_name = region_name
@ -305,7 +297,7 @@ class OpenStackCloud(object):
self.secgroup_source = kwargs.get('secgroup_source', None)
(self.verify, self.cert) = _ssl_args(verify, cacert, cert, key)
(self.verify, self.cert) = cloud_config.get_requests_verify_args()
self._cache = cache.make_region(
function_key_generator=self._make_cache_key