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 <pabelanger@redhat.com>
This commit is contained in:
parent
d8b83a0519
commit
a2f6d62208
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue