Bug#902688: stretch-pu: package openstack-debian-images/1.20~deb9u1

[Thomas Goirand <zigo@debian.org>]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

Dear release team,

The OpenStack image, as released in Stretch at this URL:
http://cdimage.debian.org/cdimage/openstack/current-9/

suffers from a very annoying "feature": it has the wrong order for the
datasource_list, with CloudStack being before OpenStack. As a consequence,
when the official OpenStack image boots, it takes 120 seconds of waiting
for a datasource which doesn't exist.

So I propose a simple fix, ordering cloud metadata server source in a
different way. As much as I understand, this should not affect the
CloudStack users, and anyway, this image is aimed at the OpenStack users.
This has also no consequence for Amazon EC2 users, as all the sources it
had previous to it are still before it.

Note that I have tested the fix on my own OpenStack deployement, and
indeed, the fixed image booted without waiting for 120 seconds for the
CloudStack metadata server.

Patch is attached. Please allow me to upload
openstack-debian-images/1.20~deb9u2 to Stretch.

Note: diff is attached, pre-built package here:
http://sid.gplhost.com/stretch-proposed-updates/openstack-debian-images/

Cheers,

Thomas Goirand (zigo)

diff -Nru openstack-debian-images-1.20~deb9u1/build-openstack-debian-image openstack-debian-images-1.20~deb9u2/build-openstack-debian-image
--- openstack-debian-images-1.20~deb9u1/build-openstack-debian-image	2017-06-23 17:02:30.000000000 +0200
+++ openstack-debian-images-1.20~deb9u2/build-openstack-debian-image	2018-06-29 17:06:12.000000000 +0200
@@ -557,7 +557,8 @@
 else
 	# For OpenStack, we would like to use Ec2 and no other API
 	echo "# to update this file, run dpkg-reconfigure cloud-init
-datasource_list: [ NoCloud, AltCloud, CloudStack, ConfigDrive, OpenStack, Ec2, MAAS, OVF, GCE, None ]" >${MOUNT_DIR}/etc/cloud/cloud.cfg.d/90_dpkg.cfg
+datasource_list: [ NoCloud, AltCloud, ConfigDrive, OpenStack, CloudStack, Ec2, MAAS, OVF, GCE, None ]" >${MOUNT_DIR}/etc/cloud/cloud.cfg.d/90_dpkg.cfg
+
 fi
 
 # Needed to have automatic mounts of /dev/vdb
diff -Nru openstack-debian-images-1.20~deb9u1/debian/changelog openstack-debian-images-1.20~deb9u2/debian/changelog
--- openstack-debian-images-1.20~deb9u1/debian/changelog	2017-06-23 17:02:30.000000000 +0200
+++ openstack-debian-images-1.20~deb9u2/debian/changelog	2018-06-29 17:06:12.000000000 +0200
@@ -1,3 +1,10 @@
+openstack-debian-images (1.20~deb9u2) stretch; urgency=medium
+
+  * Set CloudStack after OpenStack in the datasource_list, to avoid a 120s
+    delay in cloud-init when booting a machine in an OpenStack cloud.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 29 Jun 2018 17:06:12 +0200
+
 openstack-debian-images (1.20~deb9u1) stretch-proposed-updates; urgency=medium
 
   * Also add security updates for non wheezy/jessie.