Merge pull request #1605 from grycap/devel

Devel
grycap · Jul 31, 2024 · df011de · df011de
2 parents 20021c1 + de3e772
commit df011de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/IM/connectors/OpenStack.py b/IM/connectors/OpenStack.py
@@ -152,9 +152,12 @@ def get_driver(self, auth_data):
 
             protocol = self.cloud.protocol or "http"
             port = self.cloud.get_port()
+            path = self.cloud.path
+            if path in ["/", "/v3", "/v3/"]:
+                path = ""
 
             parameters = {"auth_version": self.DEFAULT_AUTH_VERSION,
-                          "auth_url": protocol + "://" + self.cloud.server + ":" + str(port),
+                          "auth_url": protocol + "://" + self.cloud.server + ":" + str(port) + path,
                           "auth_token": None,
                           "service_type": None,
                           "service_name": None,

diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py
@@ -795,6 +795,7 @@ def _gen_configure_from_interfaces(self, node, compute, interfaces):
             return None
         if not compute:
             Tosca.logger.warning("Node %s has not compute node to host in." % node.name)
+            return None
 
         variables = ""
         tasks = ""