From: Alfredo Deza <alfredo@deza.pe>
Date: Fri, 19 Jul 2013 16:28:36 +0000 (-0400)
Subject: make it easier to test by using keyword arguments
X-Git-Tag: v1.2~30^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4c15074e76042b33c985d6cbd640913b8ea8748;p=ceph-deploy.git

make it easier to test by using keyword arguments
---

diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index 2bf1b4f..862a30e 100644
--- 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)