projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix insecure option at vimconn_openstack
[osm/RO.git]
/
osm_ro
/
vimconn_openstack.py
diff --git
a/osm_ro/vimconn_openstack.py
b/osm_ro/vimconn_openstack.py
index
651afd3
..
35aed88
100644
(file)
--- a/
osm_ro/vimconn_openstack.py
+++ b/
osm_ro/vimconn_openstack.py
@@
-108,7
+108,6
@@
class vimconnector(vimconn.vimconnector):
self.verify = False
if self.config.get("ca_cert"):
self.verify = self.config.get("ca_cert")
self.verify = False
if self.config.get("ca_cert"):
self.verify = self.config.get("ca_cert")
- self.verify = self.config.get("insecure", False)
if not url:
raise TypeError('url param can not be NoneType')
if not url:
raise TypeError('url param can not be NoneType')
@@
-1170,7
+1169,8
@@
class vimconnector(vimconn.vimconnector):
continue
free_floating_ip = ip.get("floating_ip_address")
else:
continue
free_floating_ip = ip.get("floating_ip_address")
else:
- if isinstance(floating_network['floating_ip'], str):
+ if isinstance(floating_network['floating_ip'], str) and \
+ floating_network['floating_ip'].lower() != "true":
pool_id = floating_network['floating_ip']
else:
# Find the external network
pool_id = floating_network['floating_ip']
else:
# Find the external network