From a2f6d622089bfa34470b58ad76db01a3d6a3f59b Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 9 Apr 2018 13:34:46 -0400 Subject: [PATCH] Clean up diskimages for debian-(jessie|stretch) Ensure both amd64/arm64 DIBs for nodepool are using the same settings. Also adds missing label for debien-stretch on nl01.o.o. Change-Id: Ifc6759637c287754a298576cc5c0409f19ded142 Signed-off-by: Paul Belanger --- nodepool/nb03.openstack.org.yaml | 2 -- nodepool/nl01.openstack.org.yaml | 2 ++ nodepool/nodepool.yaml | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml index 3cb7efee81..6dce33f426 100644 --- a/nodepool/nb03.openstack.org.yaml +++ b/nodepool/nb03.openstack.org.yaml @@ -68,7 +68,6 @@ diskimages: - openstack-repos - nodepool-base - cache-devstack - - initialize-urandom - growroot - infra-package-needs release: stretch @@ -80,6 +79,5 @@ diskimages: DIB_DISABLE_APT_CLEANUP: '1' DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro.openstack.org/debian' DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - DIB_DEBIAN_COMPONENTS: 'main' GIT_HTTP_LOW_SPEED_TIME: '300' GIT_HTTP_LOW_SPEED_LIMIT: '1000' diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index 1e28d3730c..b3f1bc6bfb 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -13,6 +13,8 @@ labels: min-ready: 1 - name: debian-jessie min-ready: 1 + - name: debian-stretch + min-ready: 1 - name: fedora-27 min-ready: 1 - name: opensuse-423 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 3ad9a7c46a..e035cf133c 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -140,7 +140,8 @@ diskimages: DIB_IMAGE_CACHE: /opt/dib_cache DIB_APT_LOCAL_CACHE: '0' DIB_DISABLE_APT_CLEANUP: '1' - DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ + DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian' + DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_GRUB_TIMEOUT: '0' GIT_HTTP_LOW_SPEED_TIME: '300' GIT_HTTP_LOW_SPEED_LIMIT: '1000' @@ -162,7 +163,8 @@ diskimages: DIB_IMAGE_CACHE: /opt/dib_cache DIB_APT_LOCAL_CACHE: '0' DIB_DISABLE_APT_CLEANUP: '1' - DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ + DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian' + DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_GRUB_TIMEOUT: '0' GIT_HTTP_LOW_SPEED_TIME: '300' GIT_HTTP_LOW_SPEED_LIMIT: '1000'