From f4ce665565b0ac01be30239308ecf6bf2530824f Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 19 May 2015 21:25:03 -0600 Subject: [PATCH] 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. --- roles/puddle/templates/distill/ceph-distill | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 -- 2.47.3