Merge lp:~bladernr/maas-cert-server/add-lxd-images into lp:~hardware-certification/maas-cert-server/trunk

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 74
Merged at revision: 75
Proposed branch: lp:~bladernr/maas-cert-server/add-lxd-images
Merge into: lp:~hardware-certification/maas-cert-server/trunk
Diff against target: 33 lines (+15/-1)
1 file modified
usr/sbin/maniacs-setup (+15/-1)
To merge this branch: bzr merge lp:~bladernr/maas-cert-server/add-lxd-images
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+322365@code.launchpad.net

Description of the change

adds ability to mirror LXD images in the cloud dir on hte MAAS server

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'usr/sbin/maniacs-setup'
2--- usr/sbin/maniacs-setup 2017-01-18 20:02:39 +0000
3+++ usr/sbin/maniacs-setup 2017-04-11 13:28:07 +0000
4@@ -570,7 +570,8 @@
5 echo "*"
6 for arch in $get_arches; do
7 local got_it="N"
8- echo "* Downloading image for $release on $arch...."
9+ echo "* Downloading images for $release on $arch...."
10+ # Cloud Images
11 wget -nH -P $CLOUD_MIRROR --timestamping --convert-links \
12 http://cloud-images.ubuntu.com/$release/current/$release-server-cloudimg-$arch.img 2> /dev/null
13 if [ "$?" == 0 ] ; then
14@@ -583,6 +584,19 @@
15 echo "* Succeeded downloading $release-server-cloudimg-$arch-disk1.img"
16 got_it="Y"
17 fi
18+ # LXD Container Images
19+ wget -nH -P $CLOUD_MIRROR --timestamping --convert-links \
20+ http://cloud-images.ubuntu.com/$release/current/$release-server-cloudimg-$arch-lxd.tar.xz 2> /dev/null
21+ if [ "$?" == 0 ] ; then
22+ echo "* Succeeded downloading $release-server-cloudimg-$arch-lxd.tar.xz"
23+ got_it="Y"
24+ fi
25+ wget -nH -P $CLOUD_MIRROR --timestamping --convert-links \
26+ http://cloud-images.ubuntu.com/$release/current/$release-server-cloudimg-$arch-root.tar.xz 2> /dev/null
27+ if [ "$?" == 0 ] ; then
28+ echo "* Succeeded downloading $release-server-cloudimg-$arch-root.tar.xz"
29+ got_it="Y"
30+ fi
31 if [ "$got_it" == "N" ] ; then
32 echo "* Failed to get image for $release on $arch!"
33 fi

Subscribers

People subscribed via source and target branches

to status/vote changes: