calamari_setup: Add --no-adjust-repos to ceph-deploy install --<type>

Otherwise, ceph-deploy will install an apt source that points to
ceph.com, which will override the local ISO repos.

No --mon/--osd yet until 12147 is fixed

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 1e2da3699865e338c5edd91a53c1c85d7220dd4c..dede7e9c07b51608201912ccf727dc5570a98312 100644 (file)
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -351,20 +351,27 @@ def deploy_ceph(ctx, cal_svr):
     # 1.3 and later:
     # ceph-deploy new <all_mons>
     # ceph-deploy install --repo --release=ceph-mon <all_mons>
-    # ceph-deploy install --mon <all_mons>
+    # ceph-deploy install <all_mons>
     # ceph-deploy install --repo --release=ceph-osd <all_osds>
-    # ceph-deploy install --osd <all_osds>
+    # ceph-deploy install <all_osds>
     # ceph-deploy mon create-initial
+    #
+    # one might think the install <all_mons> and install <all_osds>
+    # commands would need --mon and --osd, but #12147 has not yet
+    # made it into RHCS 1.3.0; since the package split also hasn't
+    # landed, we can avoid using the flag and avoid the bug.
 
     cmds = ['ceph-deploy new ' + ' '.join(all_mons)]
 
     if use_install_repo:
         cmds.append('ceph-deploy install --repo --release=ceph-mon ' +
                     ' '.join(all_mons))
-        cmds.append('ceph-deploy install --mon ' + ' '.join(all_mons))
+        cmds.append('ceph-deploy install --no-adjust-repos ' +
+                    ' '.join(all_mons))
         cmds.append('ceph-deploy install --repo --release=ceph-osd ' +
                     ' '.join(all_osds))
-        cmds.append('ceph-deploy install --mon ' + ' '.join(all_osds))
+        cmds.append('ceph-deploy install --no-adjust-repos  ' +
+                    ' '.join(all_osds))
     else:
         cmds.append('ceph-deploy install ' + ' '.join(all_machines))