[RM-12699] Use hosts.get() in mon_create_initial()

That way we can pass callbacks

Fixes: #12699
Signed-off-by: Travis Rhoden <trhoden@redhat.com>
Reported-by: Bill Lubanovic <blubanovic@penguincomputing.com>

diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index 7c6b91ffea652e4d2156b626b3e4fac22b87bcb3..b13135ad817a7f8b37802182be1835499cc525bf 100644 (file)
--- a/ceph_deploy/mon.py
+++ b/ceph_deploy/mon.py
@@ -12,7 +12,6 @@ from ceph_deploy.lib import remoto
 from ceph_deploy.new import new_mon_keyring
 from ceph_deploy import hosts
 from ceph_deploy.misc import mon_hosts
-from ceph_deploy.connection import get_connection
 from ceph_deploy import gatherkeys
 
 
@@ -416,15 +415,14 @@ def mon_create_initial(args):
         sleeps = [20, 20, 15, 10, 10, 5]
         tries = 5
         rlogger = logging.getLogger(host)
-        rconn = get_connection(
+        distro = hosts.get(
             host,
             username=args.username,
-            logger=rlogger,
             callbacks=[packages.ceph_is_installed]
         )
 
         while tries:
-            status = mon_status_check(rconn, rlogger, host, args)
+            status = mon_status_check(distro.conn, rlogger, host, args)
             has_reached_quorum = status.get('state', '') in ['peon', 'leader']
             if not has_reached_quorum:
                 LOG.warning('%s monitor is not yet in quorum, tries left: %s' % (mon_name, tries))
@@ -436,7 +434,7 @@ def mon_create_initial(args):
                 mon_in_quorum.add(host)
                 LOG.info('%s monitor has reached quorum!', mon_name)
                 break
-        rconn.exit()
+        distro.conn.exit()
 
     if mon_in_quorum == mon_members:
         LOG.info('all initial monitors are running and have formed quorum')