From: garciadav <david.garcia@canonical.com>
Date: Mon, 25 May 2020 15:07:03 +0000 (+0200)
Subject: Merge "Get series from machine" into v7.0
X-Git-Tag: v7.1.0rc2^0
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=commitdiff_plain;h=f779105077e4b9943092c9f6e51c13dc6f584095;hp=834fdd054ea4c8309419ca049e2446a6577cc238

Merge "Get series from machine" into v7.0
---

diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py
index 06ef7d9..1f9c896 100644
--- a/n2vc/k8s_juju_conn.py
+++ b/n2vc/k8s_juju_conn.py
@@ -745,9 +745,12 @@ class K8sJujuConnector(K8sConnector):
             "Adding model '{}' to cluster_uuid '{}'".format(model_name, cluster_uuid)
         )
         try:
-            model = await self.controller.add_model(
-                model_name, config={"authorized-keys": self.juju_public_key}
-            )
+            if self.juju_public_key is not None:
+                model = await self.controller.add_model(
+                    model_name, config={"authorized-keys": self.juju_public_key}
+                )
+            else:
+                model = await self.controller.add_model(model_name)
         except Exception as ex:
             self.log.debug(ex)
             self.log.debug("Caught exception: {}".format(ex))