X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Flibjuju.py;h=86a4b0444721ad56536c2dcdc5e25cd17e26a86e;hp=161370bd1126a88ae3066a2f2a5cea847e23f2b9;hb=804cc042c04683f8a2a695e108627e0d663d79d7;hpb=7ff8ed57dd2b4fe9b8285353bdf59d7a4cd7a010 diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 161370b..86a4b04 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -32,6 +32,7 @@ from juju.controller import Controller from juju.client import client from juju import tag +from n2vc.config import ModelConfig from n2vc.juju_watcher import JujuModelWatcher from n2vc.provisioner import AsyncSSHProvisioner from n2vc.n2vc_conn import N2VCConnector @@ -63,8 +64,7 @@ class Libjuju: log: logging.Logger = None, db: dict = None, n2vc: N2VCConnector = None, - apt_mirror: str = None, - enable_os_upgrade: bool = True, + model_config: ModelConfig = {}, ): """ Constructor @@ -99,11 +99,7 @@ class Libjuju: self.n2vc = n2vc # Generate config for models - self.model_config = {} - if apt_mirror: - self.model_config["apt-mirror"] = apt_mirror - self.model_config["enable-os-refresh-update"] = enable_os_upgrade - self.model_config["enable-os-upgrade"] = enable_os_upgrade + self.model_config = model_config self.loop.set_exception_handler(self.handle_exception) self.creating_model = asyncio.Lock(loop=self.loop) @@ -444,6 +440,7 @@ class Libjuju: nonce=params.nonce, machine_id=machine_id, proxy=self.api_proxy, + series=params.series, ) )