From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Nov 2021 17:55:52 +0000 (-0600)
Subject: qa/tasks/cephadm: add hosts via mon remote
X-Git-Tag: v17.1.0~367^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a110f6c0097879b08f59a0f1ba8587875615597;p=ceph.git

qa/tasks/cephadm: add hosts via mon remote

If we use a new remote for each shell command, we end up waiting
for the image to pull on every host in sequence.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 6331793985a..edc4aad8521 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -505,11 +505,11 @@ def ceph_bootstrap(ctx, config):
                 data=ctx.ceph[cluster_name].admin_keyring)
 
             log.info('Adding host %s to orchestrator...' % remote.shortname)
-            _shell(ctx, cluster_name, remote, [
+            _shell(ctx, cluster_name, bootstrap_remote, [
                 'ceph', 'orch', 'host', 'add',
                 remote.shortname
             ])
-            r = _shell(ctx, cluster_name, remote,
+            r = _shell(ctx, cluster_name, bootstrap_remote,
                        ['ceph', 'orch', 'host', 'ls', '--format=json'],
                        stdout=StringIO())
             hosts = [node['hostname'] for node in json.loads(r.stdout.getvalue())]