From 26ec98b7dc90efa0128d9394861512da4d286d1c Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 2 Apr 2018 12:42:12 -0400 Subject: [PATCH] Use AFS mirrors to build ubuntu-bionic DIB Like we do with ubuntu-trusty / ubuntu-xenial, pin our DIB builds for ubuntu-bionic to our AFS mirrors. This will prevent issues with bionic installing newer packages when we have mirroring issues with reprepro. Change-Id: I036f90d25dfc6c244e1bd010a9f2db7e295a439f Signed-off-by: Paul Belanger --- .../elements/nodepool-base/root.d/50-apt-allow-unauthenticated | 3 ++- nodepool/nodepool.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nodepool/elements/nodepool-base/root.d/50-apt-allow-unauthenticated b/nodepool/elements/nodepool-base/root.d/50-apt-allow-unauthenticated index 928e4d9b8f..250ac9f8cd 100755 --- a/nodepool/elements/nodepool-base/root.d/50-apt-allow-unauthenticated +++ b/nodepool/elements/nodepool-base/root.d/50-apt-allow-unauthenticated @@ -22,8 +22,9 @@ set -eu set -o pipefail # NOTE(pabelanger): Because our AFS mirrors are not signed, we need to allow -# unauthenticated packages. +# unauthenticated packages and insecure repos. if [ -d "$TARGET_ROOT/etc/apt/apt.conf.d" ]; then echo "APT::Get::AllowUnauthenticated \"true\";" | sudo tee $TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated + echo "Acquire::AllowInsecureRepositories \"true\";" | sudo tee -a $TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated fi diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index a9afdb7984..f915a8fc81 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -252,7 +252,8 @@ diskimages: DIB_APT_LOCAL_CACHE: '0' DIB_DISABLE_APT_CLEANUP: '1' DIB_GRUB_TIMEOUT: '0' - # TODO(pabelanger): Add AFS mirrors once bionic-updates is created. + DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu' + DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-trusty pause: false