openstack/project-config
Code Issues Proposed changes

Merge "Use AFS mirrors to build ubuntu-bionic DIB"

Browse Source
This commit is contained in:
Zuul 2018-04-03 15:09:27 +00:00 committed by Gerrit Code Review
commit 916df89fc6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodepool/elements/nodepool-base/root.d/50-apt-allow-unauthenticated
View File

@ -22,8 +22,9 @@ set -eu
set -o pipefail set -o pipefail
# NOTE(pabelanger): Because our AFS mirrors are not signed, we need to allow # 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 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 "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 fi

3
nodepool/nodepool.yaml
View File

@ -252,7 +252,8 @@ diskimages:
DIB_APT_LOCAL_CACHE: '0' DIB_APT_LOCAL_CACHE: '0'
DIB_DISABLE_APT_CLEANUP: '1' DIB_DISABLE_APT_CLEANUP: '1'
DIB_GRUB_TIMEOUT: '0' 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' DIB_DEBIAN_COMPONENTS: 'main,universe'
- name: ubuntu-trusty - name: ubuntu-trusty
pause: false pause: false