Upgrading to GitLab 11.11.0.

Commit 53be8daa authored by Thomas Goirand's avatar Thomas Goirand

* Copy the backport repository key file inside the targets instead of using

    the openstack-backports-archive-keyring package, which doesn't work anymore
    if using Buster.
parent f45d2b3e
......@@ -72,6 +72,11 @@ fi
# Add ${debian_release}-${openstack_release} backport repo
if [ "${use_debian_dot_net_backport}" = "yes" ] ; then
if [ -e /oci-backports-pubkey.gpg ] ; then
cp /oci-backports-pubkey.gpg ${BODI_CHROOT_PATH}
chroot ${BODI_CHROOT_PATH} apt-key add /oci-backports-pubkey.gpg
rm ${BODI_CHROOT_PATH}/oci-backports-pubkey.gpg
fi
if ! [ -e ${BODI_CHROOT_PATH}/etc/apt/sources.list.d/${debian_release}-${openstack_release}.list ] ; then
echo "deb http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports main
deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports main
......@@ -79,8 +84,6 @@ deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian
deb http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports-nochange main
deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports-nochange main
" >${BODI_CHROOT_PATH}/etc/apt/sources.list.d/${debian_release}-${openstack_release}.list
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get -y --allow-unauthenticated install openstack-backports-archive-keyring
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get -y -o Dpkg::Options::="--force-confnew" dist-upgrade
fi
......
......@@ -36,6 +36,9 @@ openstack-cluster-installer (22) UNRELEASED; urgency=medium
method doesn't work anymore in Buster).
* Set haproxy's nbproc to 4 by default for swiftproxy, compute and
controller nodes.
* Copy the backport repository key file inside the targets instead of using
the openstack-backports-archive-keyring package, which doesn't work anymore
if using Buster.
[ Oliver Chaze ]
* swift: do not log in syslog general logs
......
......@@ -1487,6 +1487,11 @@ https://salsa.debian.org/openstack-team/debian/openstack-cluster-installer
chmod("$template_path/oci-in-target/usr/bin/oci-fixup-compute-node",0755);
}
#################################################
### Copy the gpg pubkey of all backport repos ###
#################################################
copy("/etc/openstack-cluster-installer/pubkey.gpg", "$template_path/oci-backports-pubkey.gpg");
###########################################################################
### Create a tarball from the $template_path folder, scp it, extract it ###
###########################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment