projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwcal
/
plugins
/
vala
/
rwcal_openstack
/
rift
/
rwcal
/
openstack
/
keystone
/
keystone_drv.py
diff --git
a/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/keystone/keystone_drv.py
b/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/keystone/keystone_drv.py
index
a754ecf
..
51b3ddd
100644
(file)
--- a/
rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/keystone/keystone_drv.py
+++ b/
rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/keystone/keystone_drv.py
@@
-42,11
+42,12
@@
class KeystoneVersionDiscover(object):
"""
supported_versions = [(2, ), (3, )]
"""
supported_versions = [(2, ), (3, )]
- def __init__(self, auth_url, logger = None):
+ def __init__(self, auth_url,
cert_validate,
logger = None):
"""
Constructor for class
Arguments
auth_url(string): Keystone Auth URL
"""
Constructor for class
Arguments
auth_url(string): Keystone Auth URL
+ cert_validate (boolean): Boolean to indicate if certificate validation is required
logger (instance of logging.Logger)
"""
logger (instance of logging.Logger)
"""
@@
-57,7
+58,7
@@
class KeystoneVersionDiscover(object):
self.log = logger
try:
self.log = logger
try:
- self._discover = discover.Discover(auth_url=auth_url)
+ self._discover = discover.Discover(auth_url=auth_url
, insecure = not cert_validate
)
except Exception as e:
self.log.exception(str(e))
self._discover = None
except Exception as e:
self.log.exception(str(e))
self._discover = None