make it easier to test by using keyword arguments

diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index 2bf1b4ff34ef0c5a032dec860c8831787b138c06..862a30e2b625aaca9e9f15ace3e209f6617f434d 100644 (file)
--- a/ceph_deploy/mon.py
+++ b/ceph_deploy/mon.py
@@ -15,10 +15,13 @@ from .util import paths
 LOG = logging.getLogger(__name__)
 
 
-def create_mon(cluster, monitor_keyring, init, paths):
-    import os
-    import socket
-    import subprocess
+def create_mon(cluster, monitor_keyring, init, **kw):
+    # These modules are imported here because this is a function that gets
+    # compiled and sent over for remote execution
+    os = kw.get('os', __import__('os'))
+    socket = kw.get('socket', __import__('socket'))
+    subprocess = kw.get('subprocess', __import__('subprocess'))
+    paths = kw.get('paths')  # noqa
 
     hostname = socket.gethostname().split('.')[0]
     path = paths.mon.path(cluster, hostname)