Merge pull request #304 from ricardobranco777/fixit

More fixes
SUSE · Aug 31, 2023 · 1759a6b · 1759a6b
2 parents 6b39d20 + 01e991d
commit 1759a6b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/ocw/lib/ec2.py b/ocw/lib/ec2.py
@@ -181,8 +181,7 @@ def delete_vpc_subnets(self, vpc) -> None:
                         if exc.response['Error']['Code'] == 'InvalidParameterValue':
                             self.log_info(exc.response['Error'])
                             continue
-                        else:
-                            raise
+                        raise
             if self.dry_run:
                 self.log_info(f'Deletion of {subnet} skipped due to dry_run mode')
             else:

diff --git a/ocw/lib/gce.py b/ocw/lib/gce.py
@@ -103,8 +103,7 @@ def list_zones(self, region) -> list:
             if GCE.get_error_reason(exc) == 'notFound':
                 self.log_dbg("list_zones: region {} not found", region)
                 return []
-            else:
-                raise exc
+            raise exc
 
     def delete_instance(self, instance_id, zone) -> None:
         self._delete_resource(

diff --git a/ocw/lib/openstack.py b/ocw/lib/openstack.py
@@ -25,7 +25,6 @@ def client(self) -> None:
         if self.__client is None:
             self.__client = openstack.connect(
                 debug=bool(DEBUG),
-                insecure=True,  # Trust the certificate
                 auth_url=self.get_data('auth_url'),
                 project_name=self.get_data('project_name'),
                 username=self.get_data('username'),