From 52df0f5a7fcbeebc8a8a9ae048c8b5b93d538e7d Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 31 Jul 2024 12:40:28 +0200 Subject: [PATCH 1/2] Fix issue with path in keystone url --- IM/connectors/OpenStack.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/IM/connectors/OpenStack.py b/IM/connectors/OpenStack.py index 282e7994..5589d07a 100644 --- 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, From de3e772cc1b7c08803a9baed7a83de8edda601c5 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 31 Jul 2024 12:40:36 +0200 Subject: [PATCH 2/2] Minor change --- IM/tosca/Tosca.py | 1 + 1 file changed, 1 insertion(+) diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py index 2cdbc78c..7823aea8 100644 --- 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 = ""