From a27e20a542488a488deec71cda81e2be5b623111 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Fri, 10 Jul 2020 13:12:44 +0200 Subject: [PATCH 1/1] Fix 1141: K8s proxy charms fixed Change-Id: If828d5fb0233029a6936aa2ef2d6d62fac66ecaa Signed-off-by: David Garcia --- osm_lcm/ns.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 31c1f6f..0d84119 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -56,7 +56,7 @@ class N2VCJujuConnectorLCM(N2VCJujuConnector): vca_type: str = None) -> (str, dict): # admit two new parameters, artifact_path and vca_type if vca_type == "k8s_proxy_charm": - ee_id = await self.n2vc.install_k8s_proxy_charm( + ee_id = await self.install_k8s_proxy_charm( charm_name=artifact_path[artifact_path.rfind("/") + 1:], namespace=namespace, artifact_path=artifact_path, @@ -1560,7 +1560,8 @@ class NsLcm(LcmBase): vca_index=vca_index, vca_type=vca_type) # if SSH access is required, then get execution environment SSH public - if vca_type in ("lxc_proxy_charm", "helm"): # if native charm we have waited already to VM be UP + # if native charm we have waited already to VM be UP + if vca_type in ("k8s_proxy_charm", "lxc_proxy_charm", "helm"): pub_key = None user = None # self.logger.debug("get ssh key block") -- 2.17.1