From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 20 May 2015 03:25:03 +0000 (-0600)
Subject: puddle: skip some cleanup in ceph-distill
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34%2Fhead;p=ceph-cm-ansible.git

puddle: skip some cleanup in ceph-distill

The ceph-distill script was deleting some files that distill doesn't
create any more (because we now set "skip_phase = createiso"). Stop
attempting to delete these.
---

diff --git a/roles/puddle/templates/distill/ceph-distill b/roles/puddle/templates/distill/ceph-distill
index 4f5582d1..cd618a93 100755
--- a/roles/puddle/templates/distill/ceph-distill
+++ b/roles/puddle/templates/distill/ceph-distill
@@ -35,15 +35,8 @@ pushd $target/latest-Ceph-1-RHEL-7
   rm -r compose/{Calamari,MON,OSD}
   pushd compose/Installer
     # Remove more things that we don't need
-    rm -r x86_64/{debug,jigdo,os}/
+    rm -r x86_64/{debug,os}/
     rm -r source/tree/
-    # This ISO is only the "Installer" ISO, not the unified one. Remove it.
-    rm x86_64/iso/$compose_id-Installer-x86_64-dvd1.iso*
-    rm source/iso/$compose_id-Installer-source-dvd1.iso*
-    # These checksums are for the "Installer" ISO (see above).
-    rm {source,x86_64}/iso/MD5SUM
-    rm {source,x86_64}/iso/SHA1SUM
-    rm {source,x86_64}/iso/SHA256SUM
     # We are now left with two single "unified" ISOs in /x86_64 and in /source.
   popd # compose/Installer
 popd # $target