"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "zun/common/clients.py" between
zun-4.0.1.tar.gz and zun-4.0.2.tar.gz

About: OpenStack Zun is a Container Management service for OpenStack.
The "Train" series (maintained release).

clients.py  (zun-4.0.1):clients.py  (zun-4.0.2)
skipping to change at line 86 skipping to change at line 86
session=session) session=session)
return self._glance return self._glance
@exception.wrap_keystone_exception @exception.wrap_keystone_exception
def neutron(self): def neutron(self):
if self._neutron: if self._neutron:
return self._neutron return self._neutron
session = self.keystone().session session = self.keystone().session
session.verify = self._get_client_option('neutron', 'ca_file') or True if self._get_client_option('neutron', 'ca_file'):
session.verify = self._get_client_option('neutron', 'ca_file')
if self._get_client_option('neutron', 'insecure'): if self._get_client_option('neutron', 'insecure'):
session.verify = False session.verify = False
endpoint_type = self._get_client_option('neutron', 'endpoint_type') endpoint_type = self._get_client_option('neutron', 'endpoint_type')
region_name = self._get_client_option('neutron', 'region_name') region_name = self._get_client_option('neutron', 'region_name')
self._neutron = neutronclient.Client(session=session, self._neutron = neutronclient.Client(session=session,
endpoint_type=endpoint_type, endpoint_type=endpoint_type,
region_name=region_name) region_name=region_name)
return self._neutron return self._neutron
@exception.wrap_keystone_exception @exception.wrap_keystone_exception
def cinder(self): def cinder(self):
if self._cinder: if self._cinder:
return self._cinder return self._cinder
session = self.keystone().session session = self.keystone().session
session.verify = self._get_client_option('cinder', 'ca_file') or True if self._get_client_option('cinder', 'ca_file'):
session.verify = self._get_client_option('cinder', 'ca_file')
if self._get_client_option('cinder', 'insecure'): if self._get_client_option('cinder', 'insecure'):
session.verify = False session.verify = False
cinder_api_version = self._get_client_option('cinder', 'api_version') cinder_api_version = self._get_client_option('cinder', 'api_version')
region_name = self._get_client_option('cinder', 'region_name') region_name = self._get_client_option('cinder', 'region_name')
endpoint_type = self._get_client_option('cinder', 'endpoint_type') endpoint_type = self._get_client_option('cinder', 'endpoint_type')
kwargs = { kwargs = {
'session': self.keystone().session, 'session': self.keystone().session,
'endpoint_type': endpoint_type, 'endpoint_type': endpoint_type,
'region_name': region_name, 'region_name': region_name,
'cacert': self._get_client_option('cinder', 'ca_file'), 'cacert': self._get_client_option('cinder', 'ca_file'),
skipping to change at line 127 skipping to change at line 129
**kwargs) **kwargs)
return self._cinder return self._cinder
@exception.wrap_keystone_exception @exception.wrap_keystone_exception
def placement(self): def placement(self):
if self._placement: if self._placement:
return self._placement, self._placement_ks_filter return self._placement, self._placement_ks_filter
session = self.keystone().session session = self.keystone().session
session.verify = \ if self._get_client_option('placement', 'ca_file'):
self._get_client_option('placement', 'ca_file') or True session.verify = self._get_client_option('placement', 'ca_file')
if self._get_client_option('placement', 'insecure'): if self._get_client_option('placement', 'insecure'):
session.verify = False session.verify = False
region_name = self._get_client_option('placement', 'region_name') region_name = self._get_client_option('placement', 'region_name')
endpoint_type = self._get_client_option('placement', 'endpoint_type') endpoint_type = self._get_client_option('placement', 'endpoint_type')
kwargs = { kwargs = {
'session': self.keystone().session, 'session': self.keystone().session,
'auth': self.keystone().auth, 'auth': self.keystone().auth,
} }
self._placement_ks_filter = {'service_type': 'placement', self._placement_ks_filter = {'service_type': 'placement',
'region_name': region_name, 'region_name': region_name,
 End of changes. 3 change blocks. 
4 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)