From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 12 Aug 2015 15:50:42 +0000 (-0600)
Subject: calamari_setup: install "cli" utils on Calamari node
X-Git-Tag: v10.2.6~165^2^2~414^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0cf220ad4ffd86ed31782f9217299758a13222ed;p=ceph.git

calamari_setup: install "cli" utils on Calamari node

In our RHCS 1.3 ceph-deploy docs, we tell users to run "ceph-deploy
install --cli" on their calamari admin node, but our smoke test wasn't
actually doing this.

See https://bugzilla.redhat.com/1252929 , "[Ubuntu 1.3.0] - ceph-deploy
install --no-adjust-repos --cli `hostname` is failing with a Traceback
error"
---

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 3d419982eb3..8ef404f1dc8 100644
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -377,6 +377,8 @@ def deploy_ceph(ctx, cal_svr):
                     ' '.join(all_osds))
         cmds.append('ceph-deploy install --no-adjust-repos --osd ' +
                     ' '.join(all_osds))
+        # We tell users to use `hostname` in our docs. Do the same here.
+        cmds.append('ceph-deploy install --no-adjust-repos --cli `hostname`')
     else:
         cmds.append('ceph-deploy install ' + ' '.join(all_machines))