Merge lp:~gandelman-a/ubuntu/oneiric/cobbler/lp850892 into lp:ubuntu/oneiric/cobbler

[Adam Gandelman]

Adds some functionality to be used by orchestra-import-isos to keep local ISOs in sync and up-to-date with what is on the mirror.

--update-check: Compares the md5 checksum of the local ISO with what is on the mirror, as reported in the corresponding server-side MD5SUMS file (ie, http://archive.ubuntu.com/ubuntu/dists/oneiric/main/installer-amd64/current/images/MD5SUMS). Returns true if checksums differ, or if the local ISO does not exist (it will be downloaded by orchestra-import-isos later)

--remove: If they exist, removes the ISO and/or corresponding cobbler profile from the server in preparation of a resync. Removing the profile is necessary as cobbler will not re-import the ISO if the profile name already exists and does not offer the ability to update a profile/

For a look at how it can be used on the Orchestra side, see: lp:~gandelman-a/ubuntu/oneiric/orchestra/lp850892 Remove

[Scott Moser (smoser)]

Overall this looks good. Some minor nit picks:
 - if (cobbler distro list | grep -qs " $rel-$arch"); then
   you dont' need a subshell there. Ie, no reason for the "()"

 - md5sum_local=`md5sum $ISO_DIR/$iso | awk '{ print $1 }'`
   does not check for failure. maybe try:
    md5sum_local=$(md5sum "$ISO_DIR/$iso") && md5sum_local="${md5sum_local% *}" && [ -n "${md5sum_local}" || fail "failed to checksum"

 - md5sum_remote=`cat $TEMP_D/MD5SUMS | grep '\./netboot/mini.iso' | awk '{ print $1 }'`
   that is a "pointless use of cat"
   try:
   md5sum_remote=$(awk '$2 == "./netboot/mini.iso" { print $1 }) && [ -n "$md5sum_remote" ] || fail "failed to get remote sum"

- probably should exit with a known exit value if "out of date" ratehr than just using "fail"
  100 + [ $md5sum_local != $md5sum_remote ] && exit 0
  101 + error "$ISO_DIR/$iso up to date."
  102 + exit 3

- did you think about trying to fix bug 850880 also ?
  I like the use of the MD5SUMS file, that might help us. I'd say you can just check the -updates first, and if its not there, try the release pocket.

[lp:~gandelman-a/ubuntu/oneiric/cobbler/lp850892]

49. By Adam Gandelman on 2011-09-16

Shell cleanup as per smoser's comments

50. By Adam Gandelman on 2011-09-16

Whitepace cleanup

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-08 13:01:55 +0000
+++ debian/changelog	2011-09-16 05:15:32 +0000
@@ -1,3 +1,11 @@
+cobbler (2.1.0+git20110602-0ubuntu26) UNRELEASED; urgency=low
+
+  * debian/cobbler-ubuntu-import: Add --check-update and --remove
+    functionality.  This should help orchestra-import-isos keep local
+    ISO caches up-to-date. (LP: #850892)
+
+ -- Adam Gandelman <[e-mail]>  Thu, 15 Sep 2011 16:36:39 -0700
+
 cobbler (2.1.0+git20110602-0ubuntu25) oneiric; urgency=low
 
   * debian/cobbler-common.install: Install missing pxeprofile_arm.template
 
=== modified file 'debian/cobbler-ubuntu-import'
--- debian/cobbler-ubuntu-import	2011-08-11 13:02:11 +0000
+++ debian/cobbler-ubuntu-import	2011-09-16 05:15:32 +0000
@@ -18,11 +18,14 @@
    import distro and profile for Ubuntu release-arch
 
    options:
-      -D | --delete-iso  delete the mini iso after downloading.  Normally
-                         they are kept in $ISO_DIR
-      -m | --mirror M    use mirror rather than default for downloading iso
-                         default: ${DEFAULT_MIRROR}
-
+      -D | --delete-iso   delete the mini iso after downloading.  Normally
+                          they are kept in $ISO_DIR
+      -m | --mirror M     use mirror rather than default for downloading iso
+                          default: ${DEFAULT_MIRROR}
+      -c | --update-check check saved ISOs against what is published on the
+                          mirror.  exits 0 if an update is needed or iso does
+                          not exist in $ISO_DIR
+      -r | --remove       remove cobbler profile/distro and cached ISO
    Note, arch can be i386, x86_64, or amd64.  However,
    the registered distro and profile will use 'x86_64' rather than 'amd64'.
    This is to keep consistent with cobbler naming.
@@ -49,14 +52,16 @@
 	mount -o loop "$1" "$2"
 }
 
-short_opts="Dhm:o:v"
-long_opts="delete-iso,help,mirror:,verbose"
+short_opts="Dhm:o:vcr"
+long_opts="delete-iso,help,mirror:,verbose,update-check,remove"
 getopt_out=$(getopt --name "${0##*/}" \
 	--options "${short_opts}" --long "${long_opts}" -- "$@") &&
 	eval set -- "${getopt_out}" ||
 	bad_Usage
 
 delete=false
+check_update=false
+remove=false
 mirror=${DEFAULT_MIRROR}
 
 while [ $# -ne 0 ]; do
@@ -66,6 +71,8 @@
 		-m|--mirror) mirror=${2}; shift;;
 		-D|--delete-iso) delete=true;;
 		-v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
+		-c|--update-check) check_update=true;;
+		-r|--remove) remove=true;;
 		--) shift; break;;
 	esac
 	shift;
@@ -91,6 +98,30 @@
 	ubuntu_arch=$arch; [ "$arch" = "x86_64" ] && ubuntu_arch=amd64
 	iso=$rel-$arch-mini.iso
 	u=$mirror/dists/$rel/main/installer-$ubuntu_arch/current/images/netboot/mini.iso
+	md5=$mirror/dists/$rel/main/installer-$ubuntu_arch/current/images/MD5SUMS
+	if $remove; then
+		if [ -f "$ISO_DIR/$iso" ]; then
+			rm -rf "$ISO_DIR/$iso" ||
+				fail "Could not delete $ISO_DIR/$iso"
+		fi
+		if cobbler distro list | grep -qs " $rel-$arch"; then
+			cobbler distro remove --name=$rel-$arch ||
+				fail "Could not remove cobbler profile for $rel-$arch"
+		fi
+		exit 0
+	fi
+	if $check_update; then
+		# compare md5 of the local iso to whats on the mirror.
+		[ ! -f "$ISO_DIR/$iso" ] && exit 0
+		md5=$mirror/dists/$rel/main/installer-$ubuntu_arch/current/images/MD5SUMS
+		md5sum_local=$(md5sum "$ISO_DIR/$iso") && md5sum_local=${md5sum_local% *} \
+			&& [ -n $md5sum_local ] || fail "failed to checksum $ISO_DIR/$iso"
+		wget -qO $TEMP_D/MD5SUMS $md5 || fail "failed to download MD5SUMS for $rel-$arch: $u"
+		md5sum_remote=$(awk '$2 == "./netboot/mini.iso" { print $1 }' $TEMP_D/MD5SUMS) &&
+			[ -n $md5sum_remote ] || fail "failed to parse checksum from $TEMP_D/MD5SUM"
+		[ $md5sum_local != $md5sum_remote ] && exit 0
+		error "$ISO_DIR/$iso up to date." && exit 3
+	fi
 	if [ ! -f "$ISO_DIR/$iso" ]; then
 		wget -O "$TEMP_D/$iso" "$u" && [ -s "$TEMP_D/$iso" ] ||
 			fail "failed download for $rel-$arch: $u"