projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding optional namespace to K8s install
[osm/N2VC.git]
/
n2vc
/
k8s_juju_conn.py
diff --git
a/n2vc/k8s_juju_conn.py
b/n2vc/k8s_juju_conn.py
index
3316087
..
550ad12
100644
(file)
--- a/
n2vc/k8s_juju_conn.py
+++ b/
n2vc/k8s_juju_conn.py
@@
-306,7
+306,8
@@
class K8sJujuConnector(K8sConnector):
timeout: float = 300,
params: dict = None,
db_dict: dict = None,
timeout: float = 300,
params: dict = None,
db_dict: dict = None,
- kdu_name: str = None
+ kdu_name: str = None,
+ namespace: str = None
) -> bool:
"""Install a bundle
) -> bool:
"""Install a bundle
@@
-318,6
+319,7
@@
class K8sJujuConnector(K8sConnector):
to finish
:param params dict: Key-value pairs of instantiation parameters
:param kdu_name: Name of the KDU instance to be installed
to finish
:param params dict: Key-value pairs of instantiation parameters
:param kdu_name: Name of the KDU instance to be installed
+ :param namespace: K8s namespace to use for the KDU instance
:return: If successful, returns ?
"""
:return: If successful, returns ?
"""
@@
-396,7
+398,7
@@
class K8sJujuConnector(K8sConnector):
)
self.log.debug("All units active.")
)
self.log.debug("All units active.")
- except concurrent.futures._base.TimeoutError:
+ except concurrent.futures._base.TimeoutError:
# TODO use asyncio.TimeoutError
os.chdir(previous_workdir)
self.log.debug("[install] Timeout exceeded; resetting cluster")
await self.reset(cluster_uuid)
os.chdir(previous_workdir)
self.log.debug("[install] Timeout exceeded; resetting cluster")
await self.reset(cluster_uuid)