Merge lp:~smoser/ubuntu/quantal/lxc/lp-1045955 into lp:ubuntu/quantal/lxc

[Scott Moser]

do not depend on 'ubuntu' existing in image, rather let cloud-init create it.

Primary change here is to make cloud images in quantal work (LP: #1035955).
Other changes here are:
 * use meta-data for passing public keys in
 * use user-data for passing in password
 * support --auth-key being a non-absolute path
 * white space/indentation cleanups in templates/lxc-ubuntu-cloud.in

[Serge Hallyn (serge-hallyn)]

Thanks, this has been merged upstream.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-08-30 16:32:45 +0000
+++ .pc/applied-patches	2012-09-04 20:04:28 +0000
@@ -78,3 +78,4 @@
 0204-ubuntu-cloud-userdata-path
 0205-lxc-ls-manpage-document-two-lines
 0206-lxc-wait-initialize-timeout
+0207-ubuntu-cloud-fixes.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-30 16:32:45 +0000
+++ debian/changelog	2012-09-04 20:04:28 +0000
@@ -2,6 +2,9 @@
 
   * 0206-lxc-wait-initialize-timeout: initialize timeout to -1 so lxc-wait
     will, by default, wait for the container to enter the requested state.
+  * 0207-ubuntu-cloud-fixes.patch: cleanups to lxc-ubuntu-cloud.in
+    fix for quantal images that do not have user 'ubuntu' present
+    (LP: #1045955)
 
  -- Serge Hallyn <[e-mail]>  Thu, 30 Aug 2012 11:32:06 -0500
 

=== added file 'debian/patches/0207-ubuntu-cloud-fixes.patch'
--- debian/patches/0207-ubuntu-cloud-fixes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0207-ubuntu-cloud-fixes.patch	2012-09-04 20:04:28 +0000
@@ -0,0 +1,159 @@
+--- a/templates/lxc-ubuntu-cloud.in
++++ b/templates/lxc-ubuntu-cloud.in
+@@ -230,6 +230,15 @@ if [ -n "$userdata" ]; then
+     fi
+ fi
+ 
++if [ -n "$auth_key" ]; then
++    if [ ! -f "$auth_key" ]; then
++        echo "--auth-key=${auth_key} must reference a file"
++        exit 1
++    fi
++    auth_key=$(readlink -f "${auth_key}") ||
++        { echo "failed to get full path for auth_key"; exit 1; }
++fi
++
+ if [ -z "$path" ]; then
+     echo "'path' parameter is required"
+     exit 1
+@@ -258,17 +267,17 @@ cache="/var/cache/lxc/cloud-$release"
+ mkdir -p $cache
+ 
+ if [ -n "$tarball" ]; then
+-	url2="$tarball"
++    url2="$tarball"
+ else
+-	url1=`ubuntu-cloudimg-query $release $stream $arch --format "%{url}\n"`
+-	url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
++    url1=`ubuntu-cloudimg-query $release $stream $arch --format "%{url}\n"`
++    url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
+ fi
+ 
+ filename=`basename $url2`
+ 
+ wgetcleanup()
+ {
+-	rm -f $filename
++    rm -f $filename
+ }
+ 
+ buildcleanup()
+@@ -321,7 +330,7 @@ mkdir -p /var/lock/subsys/
+ 
+     trap wgetcleanup EXIT SIGHUP SIGINT SIGTERM
+     if [ ! -f $filename ]; then
+-       wget $url2 || build_root_tgz $url1 $filename
++        wget $url2 || build_root_tgz $url1 $filename
+     fi
+     trap EXIT
+     trap SIGHUP
+@@ -335,67 +344,63 @@ mkdir -p /var/lock/subsys/
+ 
+ 
+     if [ $cloud -eq 0 ]; then
+-	echo "Configuring for running outside of a cloud environment"
+-	echo "If you want to configure for a cloud evironment, please use '-- -C' to create the container"
++        echo "Configuring for running outside of a cloud environment"
++        echo "If you want to configure for a cloud evironment, please use '-- -C' to create the container"
+ 
+-	seed_d=$rootfs/var/lib/cloud/seed/nocloud-net
+-	rhostid=$(uuidgen | cut -c -8)
+-	host_id=${hostid:-$rhostid}
+-	mkdir -p $seed_d
++        seed_d=$rootfs/var/lib/cloud/seed/nocloud-net
++        rhostid=$(uuidgen | cut -c -8)
++        host_id=${hostid:-$rhostid}
++        mkdir -p $seed_d
+ 
+-	cat > "$seed_d/meta-data" <<EOF
+-instance_id: lxc-$host_id
++        cat > "$seed_d/meta-data" <<EOF
++instance-id: lxc-$host_id
+ EOF
++        if [ -n "$auth_key" ]; then
++            {
++            echo "public-keys:" &&
++            sed -e '/^$/d' -e 's,^,- ,' "$auth_key" "$auth_key"
++            } >> "$seed_d/meta-data"
++            [ $? -eq 0 ] ||
++                { echo "failed to write public keys to metadata"; exit 1; }
++        fi
++
++        rm $rootfs/etc/hostname
++
++        if [ $locales -eq 1 ]; then
++            cp /usr/lib/locale/locale-archive $rootfs/usr/lib/locale/locale-archive
++        fi
++
++        if [ -f "$userdata" ]; then
++            echo "Using custom user-data"
++            cp $userdata $seed_d/user-data
++        else
++
++            if [ -z "$MIRROR" ]; then
++                MIRROR="http://archive.ubuntu.com/ubuntu"
++            fi
+ 
+-	rm $rootfs/etc/hostname
+-
+-	if [ $locales -eq 1 ]; then
+-		cp /usr/lib/locale/locale-archive $rootfs/usr/lib/locale/locale-archive
+-	fi
+-
+-
+-	if [ -n "$auth_key" -a -f "$auth_key" ]; then
+-		u_path="/home/ubuntu/.ssh"
+-		root_u_path="$rootfs/$u_path"
+-		mkdir -p $root_u_path
+-		cp $auth_key "$root_u_path/authorized_keys"
+-		chroot $rootfs chown -R ubuntu: "$u_path"
+-
+-		echo "Inserted SSH public key from $auth_key into /home/ubuntu/.ssh/authorized_keys"
+-	fi
+-
+-	if [ -f "$userdata" ]; then
+-		echo "Using custom user-data"
+-		cp $userdata $seed_d/user-data
+-	else
+-
+-		if [ -z "$MIRROR" ]; then
+-			MIRROR="http://archive.ubuntu.com/ubuntu"
+-		fi
+-
+-		cat > "$seed_d/user-data" <<EOF
++            cat > "$seed_d/user-data" <<EOF
+ #cloud-config
+ output: {all: '| tee -a /var/log/cloud-init-output.log'}
+-apt-mirror: $MIRROR
++apt_mirror: $MIRROR
+ manage_etc_hosts: localhost
+ locale: $(/usr/bin/locale | awk -F= '/LANG=/ {print$NF}')
++password: ubuntu
++chpasswd: { expire: False }
+ EOF
+-	fi
+-
+-	chroot $rootfs /usr/sbin/usermod -U ubuntu
+-    	echo "ubuntu:ubuntu" | chroot $rootfs chpasswd
+-	echo "Please login as user ubuntu with password ubuntu."
++        fi
+ 
+-   else
++    else
+ 
+-	echo "Configured for running in a cloud environment."
+-	echo "If you do not have a meta-data service, this container will likely be useless."
+-
+-   fi
++        echo "Configured for running in a cloud environment."
++        echo "If you do not have a meta-data service, this container will likely be useless."
+ 
++    fi
+ ) 200>/var/lock/subsys/lxc-ubucloud
+ 
+ copy_configuration $path $rootfs $name $arch $release
+ 
+ echo "Container $name created."
+ exit 0
++
++# vi: ts=4 expandtab

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-08-30 16:32:45 +0000
+++ debian/patches/series	2012-09-04 20:04:28 +0000
@@ -80,3 +80,4 @@
 0204-ubuntu-cloud-userdata-path
 0205-lxc-ls-manpage-document-two-lines
 0206-lxc-wait-initialize-timeout
+0207-ubuntu-cloud-fixes.patch

=== modified file 'templates/lxc-ubuntu-cloud.in'
--- templates/lxc-ubuntu-cloud.in	2012-08-30 10:05:06 +0000
+++ templates/lxc-ubuntu-cloud.in	2012-09-04 20:04:28 +0000
@@ -230,6 +230,15 @@
     fi
 fi
 
+if [ -n "$auth_key" ]; then
+    if [ ! -f "$auth_key" ]; then
+        echo "--auth-key=${auth_key} must reference a file"
+        exit 1
+    fi
+    auth_key=$(readlink -f "${auth_key}") ||
+        { echo "failed to get full path for auth_key"; exit 1; }
+fi
+
 if [ -z "$path" ]; then
     echo "'path' parameter is required"
     exit 1
@@ -258,17 +267,17 @@
 mkdir -p $cache
 
 if [ -n "$tarball" ]; then
-	url2="$tarball"
+    url2="$tarball"
 else
-	url1=`ubuntu-cloudimg-query $release $stream $arch --format "%{url}\n"`
-	url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
+    url1=`ubuntu-cloudimg-query $release $stream $arch --format "%{url}\n"`
+    url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
 fi
 
 filename=`basename $url2`
 
 wgetcleanup()
 {
-	rm -f $filename
+    rm -f $filename
 }
 
 buildcleanup()
@@ -321,7 +330,7 @@
 
     trap wgetcleanup EXIT SIGHUP SIGINT SIGTERM
     if [ ! -f $filename ]; then
-       wget $url2 || build_root_tgz $url1 $filename
+        wget $url2 || build_root_tgz $url1 $filename
     fi
     trap EXIT
     trap SIGHUP
@@ -335,67 +344,63 @@
 
 
     if [ $cloud -eq 0 ]; then
-	echo "Configuring for running outside of a cloud environment"
-	echo "If you want to configure for a cloud evironment, please use '-- -C' to create the container"
-
-	seed_d=$rootfs/var/lib/cloud/seed/nocloud-net
-	rhostid=$(uuidgen | cut -c -8)
-	host_id=${hostid:-$rhostid}
-	mkdir -p $seed_d
-
-	cat > "$seed_d/meta-data" <<EOF
-instance_id: lxc-$host_id
+        echo "Configuring for running outside of a cloud environment"
+        echo "If you want to configure for a cloud evironment, please use '-- -C' to create the container"
+
+        seed_d=$rootfs/var/lib/cloud/seed/nocloud-net
+        rhostid=$(uuidgen | cut -c -8)
+        host_id=${hostid:-$rhostid}
+        mkdir -p $seed_d
+
+        cat > "$seed_d/meta-data" <<EOF
+instance-id: lxc-$host_id
 EOF
-
-	rm $rootfs/etc/hostname
-
-	if [ $locales -eq 1 ]; then
-		cp /usr/lib/locale/locale-archive $rootfs/usr/lib/locale/locale-archive
-	fi
-
-
-	if [ -n "$auth_key" -a -f "$auth_key" ]; then
-		u_path="/home/ubuntu/.ssh"
-		root_u_path="$rootfs/$u_path"
-		mkdir -p $root_u_path
-		cp $auth_key "$root_u_path/authorized_keys"
-		chroot $rootfs chown -R ubuntu: "$u_path"
-
-		echo "Inserted SSH public key from $auth_key into /home/ubuntu/.ssh/authorized_keys"
-	fi
-
-	if [ -f "$userdata" ]; then
-		echo "Using custom user-data"
-		cp $userdata $seed_d/user-data
-	else
-
-		if [ -z "$MIRROR" ]; then
-			MIRROR="http://archive.ubuntu.com/ubuntu"
-		fi
-
-		cat > "$seed_d/user-data" <<EOF
+        if [ -n "$auth_key" ]; then
+            {
+            echo "public-keys:" &&
+            sed -e '/^$/d' -e 's,^,- ,' "$auth_key" "$auth_key"
+            } >> "$seed_d/meta-data"
+            [ $? -eq 0 ] ||
+                { echo "failed to write public keys to metadata"; exit 1; }
+        fi
+
+        rm $rootfs/etc/hostname
+
+        if [ $locales -eq 1 ]; then
+            cp /usr/lib/locale/locale-archive $rootfs/usr/lib/locale/locale-archive
+        fi
+
+        if [ -f "$userdata" ]; then
+            echo "Using custom user-data"
+            cp $userdata $seed_d/user-data
+        else
+
+            if [ -z "$MIRROR" ]; then
+                MIRROR="http://archive.ubuntu.com/ubuntu"
+            fi
+
+            cat > "$seed_d/user-data" <<EOF
 #cloud-config
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
-apt-mirror: $MIRROR
+apt_mirror: $MIRROR
 manage_etc_hosts: localhost
 locale: $(/usr/bin/locale | awk -F= '/LANG=/ {print$NF}')
+password: ubuntu
+chpasswd: { expire: False }
 EOF
-	fi
-
-	chroot $rootfs /usr/sbin/usermod -U ubuntu
-    	echo "ubuntu:ubuntu" | chroot $rootfs chpasswd
-	echo "Please login as user ubuntu with password ubuntu."
-
-   else
-
-	echo "Configured for running in a cloud environment."
-	echo "If you do not have a meta-data service, this container will likely be useless."
-
-   fi
-
+        fi
+
+    else
+
+        echo "Configured for running in a cloud environment."
+        echo "If you do not have a meta-data service, this container will likely be useless."
+
+    fi
 ) 200>/var/lock/subsys/lxc-ubucloud
 
 copy_configuration $path $rootfs $name $arch $release
 
 echo "Container $name created."
 exit 0
+
+# vi: ts=4 expandtab