Get series from machine

[osm/N2VC.git] / n2vc / n2vc_juju_conn.py

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index 0e10337..0ac8b08 100644 (file)
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -1034,7 +1034,7 @@ class N2VCJujuConnector(N2VCConnector):
         results = await client_facade.AddMachines(params=[params])
         error = results.machines[0].error
         if error:
-            msg = "Error adding machine: {}}".format(error.message)
+            msg = "Error adding machine: {}".format(error.message)
             self.log.error(msg=msg)
             raise ValueError(msg)
 
@@ -1113,14 +1113,14 @@ class N2VCJujuConnector(N2VCConnector):
                 )
             )
             self.log.debug("charm: {}".format(charm_path))
-            series = "xenial"
+            machine = model.machines[machine_id]
             # series = None
             application = await model.deploy(
                 entity_url=charm_path,
                 application_name=application_name,
                 channel="stable",
                 num_units=1,
-                series=series,
+                series=machine.series,
                 to=machine_id,
                 config=config,
             )
@@ -1348,7 +1348,7 @@ class N2VCJujuConnector(N2VCConnector):
                         model_name=model_name,
                         config=config_dict,
                         cloud_name=self.cloud,
-                        credential_name="admin",
+                        credential_name=self.cloud,
                     )
                 self.log.info("New model created, name={}".format(model_name))
             else: