X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimconn_openstack.py;h=61d4b43890e03f31cebeb2fbb4fd96876ed57caf;hb=ef45f6154641499b4ad1d571925468637bb4c80c;hp=8abf7a2114c356ea14b7ab45527936f0acd36f4b;hpb=f8383b8e9cd15567ab837479dada84ff6681a337;p=osm%2FRO.git diff --git a/vimconn_openstack.py b/vimconn_openstack.py index 8abf7a21..61d4b438 100644 --- a/vimconn_openstack.py +++ b/vimconn_openstack.py @@ -78,6 +78,9 @@ class vimconnector(vimconn.vimconnector): self.k_creds={} self.n_creds={} + if self.config.get("insecure"): + self.k_creds["insecure"] = True + self.n_creds["insecure"] = True if not url: raise TypeError, 'url param can not be NoneType' self.k_creds['auth_url'] = url @@ -656,9 +659,9 @@ class vimconnector(vimconn.vimconnector): #Then we filter by the rest of filter fields: checksum filtered_list = [] for image in image_list: - image_dict=self.glance.images.get(image.id) - if 'checksum' not in filter_dict or image_dict['checksum']==filter_dict.get('checksum'): - filtered_list.append(image_dict) + image_class=self.glance.images.get(image.id) + if 'checksum' not in filter_dict or image_class['checksum']==filter_dict.get('checksum'): + filtered_list.append(image_class.copy()) return filtered_list except (ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e: self._format_exception(e) @@ -758,7 +761,7 @@ class vimconnector(vimconn.vimconnector): userdata_dict["ssh-authorized-keys"] = cloud_config["key-pairs"] userdata_dict["users"] = [{"default": None, "ssh-authorized-keys": cloud_config["key-pairs"] }] if cloud_config.get("users"): - if "users" not in cloud_config: + if "users" not in userdata_dict: userdata_dict["users"] = [ "default" ] for user in cloud_config["users"]: user_info = {