projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow starts N2VCJujuConnector without the parameter api_proxy
[osm/N2VC.git]
/
n2vc
/
n2vc_juju_conn.py
diff --git
a/n2vc/n2vc_juju_conn.py
b/n2vc/n2vc_juju_conn.py
index
ed1250d
..
ed53da4
100644
(file)
--- a/
n2vc/n2vc_juju_conn.py
+++ b/
n2vc/n2vc_juju_conn.py
@@
-175,6
+175,7
@@
class N2VCJujuConnector(N2VCConnector):
self.warning(
"api_proxy is not configured. Support for native charms is disabled"
)
self.warning(
"api_proxy is not configured. Support for native charms is disabled"
)
+ self.api_proxy = None
if "enable_os_upgrade" in vca_config:
self.enable_os_upgrade = vca_config["enable_os_upgrade"]
if "enable_os_upgrade" in vca_config:
self.enable_os_upgrade = vca_config["enable_os_upgrade"]
@@
-241,7
+242,7
@@
class N2VCJujuConnector(N2VCConnector):
models = await self.libjuju.list_models(contains=ns_id)
for m in models:
models = await self.libjuju.list_models(contains=ns_id)
for m in models:
- status[m] = self.libjuju.get_model_status(m)
+ status[m] =
await
self.libjuju.get_model_status(m)
if yaml_format:
return obj_to_yaml(status)
if yaml_format:
return obj_to_yaml(status)
@@
-577,6
+578,9
@@
class N2VCJujuConnector(N2VCConnector):
application_name=application_name,
machine_id="k8s",
)
application_name=application_name,
machine_id="k8s",
)
+
+ self._write_ee_id_db(db_dict=db_dict, ee_id=ee_id)
+
return ee_id
async def get_ee_ssh_public__key(
return ee_id
async def get_ee_ssh_public__key(