Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
Please unblock package openstack-debian-images
The version currently in Testing doesn't setup bonding correctly: there
are entries in /etc/network/interfaces for the slave devices, which
should not be there. It used to work in Buster, it doesn't in Bullseye.
The attached debdiff fixes this.
Note that 1.59 has already been unblocked, so I'm attaching a debdiff
between 1.59 and 1.60.
Please unblock openstack-debian-images/1.60.
Cheers,
Thomas Goirand (zigo)
diff -Nru openstack-debian-images-1.59/build-openstack-debian-image
openstack-debian-images-1.60/build-openstack-debian-image
--- openstack-debian-images-1.59/build-openstack-debian-image 2021-04-15
11:35:32.000000000 +0200
+++ openstack-debian-images-1.60/build-openstack-debian-image 2021-04-19
11:31:35.000000000 +0200
@@ -1339,18 +1339,21 @@
"bond")
INTERFACE=bond${BOND_NUMBER}
BOND_NUMBER=$(( ${BOND_NUMBER} + 1 ))
- # Iface 0
- echo "# Interface ${SE_IFACE0}" >> ${ENI}
- echo "auto ${SE_IFACE0}" >> ${ENI}
- echo "iface ${SE_IFACE0} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
- # Iface 1
- echo "# Interface ${SE_IFACE1}" >> ${ENI}
- echo "auto ${SE_IFACE1}" >> ${ENI}
- echo "iface ${SE_IFACE1} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
+ if [ "${RELEASE}" = "wheezy" ] || [ "${RELEASE}" =
"stretch" ] || [ "${RELEASE}" = "buster" ] ; then
+ # Iface 0
+ echo "# Interface ${SE_IFACE0}" >> ${ENI}
+ echo "auto ${SE_IFACE0}" >> ${ENI}
+ echo "iface ${SE_IFACE0} inet manual" >> ${ENI}
+ echo " bond-master ${INTERFACE}" >> ${ENI}
+ echo "" >> ${ENI}
+ # Iface 1
+ echo "# Interface ${SE_IFACE1}" >> ${ENI}
+ echo "auto ${SE_IFACE1}" >> ${ENI}
+ echo "iface ${SE_IFACE1} inet manual" >> ${ENI}
+ echo " bond-master ${INTERFACE}" >> ${ENI}
+ echo "" >> ${ENI}
+ fi
+
# Bridge
echo "# Interface ${INTERFACE}" >> ${ENI}
echo "auto ${INTERFACE}" >> ${ENI}
@@ -1481,18 +1484,20 @@
fi
echo "" >> ${ENI}
else
- # Iface 0
- echo "# Interface ${SE_IFACE0}" >> ${ENI}
- echo "auto ${SE_IFACE0}" >> ${ENI}
- echo "iface ${SE_IFACE0} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
- # Iface 1
- echo "# Interface ${SE_IFACE1}" >> ${ENI}
- echo "auto ${SE_IFACE1}" >> ${ENI}
- echo "iface ${SE_IFACE1} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
+ if [ "${RELEASE}" = "wheezy" ] || [
"${RELEASE}" = "stretch" ] || [ "${RELEASE}" = "buster" ] ; then
+ # Iface 0
+ echo "# Interface ${SE_IFACE0}" >>
${ENI}
+ echo "auto ${SE_IFACE0}" >> ${ENI}
+ echo "iface ${SE_IFACE0} inet manual"
>> ${ENI}
+ echo " bond-master ${INTERFACE}" >>
${ENI}
+ echo "" >> ${ENI}
+ # Iface 1
+ echo "# Interface ${SE_IFACE1}" >>
${ENI}
+ echo "auto ${SE_IFACE1}" >> ${ENI}
+ echo "iface ${SE_IFACE1} inet manual"
>> ${ENI}
+ echo " bond-master ${INTERFACE}" >>
${ENI}
+ echo "" >> ${ENI}
+ fi
# Bonding interface
echo "# Interface ${INTERFACE}" >> ${ENI}
@@ -1567,18 +1572,21 @@
"bondvlanbridge")
INTERFACE=bond${BOND_NUMBER}
BOND_NUMBER=$(( ${BOND_NUMBER} + 1 ))
- # Iface 0
- echo "# Interface ${SE_IFACE0}" >> ${ENI}
- echo "auto ${SE_IFACE0}" >> ${ENI}
- echo "iface ${SE_IFACE0} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
- # Iface 1
- echo "# Interface ${SE_IFACE1}" >> ${ENI}
- echo "auto ${SE_IFACE1}" >> ${ENI}
- echo "iface ${SE_IFACE1} inet manual" >> ${ENI}
- echo " bond-master ${INTERFACE}" >> ${ENI}
- echo "" >> ${ENI}
+ if [ "${RELEASE}" = "wheezy" ] || [ "${RELEASE}" =
"stretch" ] || [ "${RELEASE}" = "buster" ] ; then
+ # Iface 0
+ echo "# Interface ${SE_IFACE0}" >> ${ENI}
+ echo "auto ${SE_IFACE0}" >> ${ENI}
+ echo "iface ${SE_IFACE0} inet manual" >> ${ENI}
+ echo " bond-master ${INTERFACE}" >> ${ENI}
+ echo "" >> ${ENI}
+ # Iface 1
+ echo "# Interface ${SE_IFACE1}" >> ${ENI}
+ echo "auto ${SE_IFACE1}" >> ${ENI}
+ echo "iface ${SE_IFACE1} inet manual" >> ${ENI}
+ echo " bond-master ${INTERFACE}" >> ${ENI}
+ echo "" >> ${ENI}
+ fi
+
# Bond iface
echo "# Interface ${INTERFACE}" >> ${ENI}
echo "auto ${INTERFACE}" >> ${ENI}
diff -Nru openstack-debian-images-1.59/debian/changelog
openstack-debian-images-1.60/debian/changelog
--- openstack-debian-images-1.59/debian/changelog 2021-04-15
11:35:32.000000000 +0200
+++ openstack-debian-images-1.60/debian/changelog 2021-04-19
11:31:35.000000000 +0200
@@ -1,3 +1,10 @@
+openstack-debian-images (1.60) unstable; urgency=medium
+
+ * Do not set eth0+eth1 bond-master option if >= bullseye, as this just fails
+ to bring up bond0.
+
+ -- Thomas Goirand <z...@debian.org> Mon, 19 Apr 2021 11:31:35 +0200
+
openstack-debian-images (1.59) unstable; urgency=medium
* Wait 5 seconds after fsck before removing the loop device.
