Moved execution of utils.read_ssh_key to a thread.

[osm/N2VC.git] / juju / controller.py

diff --git a/juju/controller.py b/juju/controller.py
index 67409ba..d64a2f7 100644 (file)
--- a/juju/controller.py
+++ b/juju/controller.py
@@ -1,7 +1,9 @@
 import asyncio
+import concurrent.futures
 import logging
 
 from . import tag
+from . import utils
 from .client import client
 from .client import connection
 from .client import watcher
@@ -55,44 +57,65 @@ class Controller(object):
             self.connection = None
 
     async def add_model(
-            self, model_name, cloud_name, credential_name,
+            self, model_name, cloud_name=None, credential_name=None,
             owner=None, config=None, region=None):
         """Add a model to this controller.
 
         :param str model_name: Name to give the new model.
         :param str cloud_name: Name of the cloud in which to create the
-            model, e.g. 'aws'.
+            model, e.g. 'aws'. Defaults to same cloud as controller.
         :param str credential_name: Name of the credential to use when
-            creating the model.
+            creating the model. Defaults to current credential. If you
+            pass a credential_name, you must also pass a cloud_name,
+            even if it's the default cloud.
         :param str owner: Username that will own the model. Defaults to
             the current user.
         :param dict config: Model configuration.
         :param str region: Region in which to create the model.
 
         """
-        # XXX: We can probably obviate the cloud_name param by getting it
-        # from the controller itself.
-
         model_facade = client.ModelManagerFacade()
         model_facade.connect(self.connection)
 
         owner = owner or self.connection.info['user-info']['identity']
+        cloud_name = cloud_name or await self.get_cloud()
+
+        if credential_name:
+            credential = tag.credential(
+                cloud_name,
+                tag.untag('user-', owner),
+                credential_name
+            )
+        else:
+            credential = None
 
         log.debug('Creating model %s', model_name)
 
         model_info = await model_facade.CreateModel(
             tag.cloud(cloud_name),
             config,
-            tag.credential(
-                cloud_name,
-                tag.untag('user-', owner),
-                credential_name
-            ),
+            credential,
             model_name,
             owner,
             region,
         )
 
+        # Add our ssh key to the model, to work around
+        # https://bugs.launchpad.net/juju/+bug/1643076
+        try:
+            ssh_key = await self.loop.run_in_executor(
+                concurrent.futures.ThreadPoolExecutor(),
+                utils.read_ssh_key
+            )
+            await utils.execute_process(
+                'juju', 'add-ssh-key', '-m', model_name, ssh_key, log=log)
+        except Exception as e:
+            log.exception(
+                "Could not add ssh key to model. You will not be able "
+                "to ssh into machines in this model. "
+                "Manually running `juju add-ssh-key <key>` in the cli "
+                "may fix this problem.")
+
         model = Model()
         await model.connect(
             self.connection.endpoint,
@@ -176,6 +199,17 @@ class Controller(object):
         """
         pass
 
+    async def get_cloud(self):
+        """
+        Get the name of the cloud that this controller lives on.
+        """
+        cloud_facade = client.CloudFacade()
+        cloud_facade.connect(self.connection)
+
+        result = await cloud_facade.Clouds()
+        cloud = list(result.clouds.keys())[0]  # only lives on one cloud
+        return tag.untag('cloud-', cloud)
+
     def get_models(self, all_=False, username=None):
         """Return list of available models on this controller.