sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove DIB_[DISTRO]_DISTRIBUTION_MIRROR

Browse Source 
We added the DIB_distro_DISTRIBUTION_MIRROR arguments with
I92964b17ec3e47cf97e3a3091f054b2a205ac768 as a way that we could
source a list of mirrors and then have the distro elements choose
which one applied to them.

However, this hasn't worked out to be so useful.  The
openstack-ci-mirrors element is working as a mirror setup script -- it
translates the openstack CI mirror list variables into the generic
"DIB_DISTRIBUTION_MIRROR" as appropriate for each distro's build.
Also, it turns out there's other things that need to be done, such as
turning off gpg checking, which mean the idea of "just export
variables" hasn't turned out as valid ... you need actual code
involved to get it right.

AFAICT we never actually documented these, and they do not seem to be
in use.  They have caused considerable confusion when dealing with new
platforms as we try to keep consistency.  Remove them.

[1] http://codesearch.openstack.org/?q=DIB_.*_DISTRIBUTION_MIRROR&i=nope&files=&repos=

Change-Id: Ifc4ab700631ffdfbe790068558f670f9a11dde5e
This commit is contained in:
Ian Wienand 2017-07-17 14:29:34 +10:00
parent 5d919bdc8e
commit 3457d2f8e8
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/centos7/environment.d/10-centos7-distro-name.bash
View File

@ -4,6 +4,3 @@ export DIB_RELEASE=GenericCloud
# Useful for elements that work with fedora (dnf) & centos # Useful for elements that work with fedora (dnf) & centos
export YUM=${YUM:-yum} export YUM=${YUM:-yum}
if [ -n "${DIB_CENTOS_DISTRIBUTION_MIRROR:-}" ]; then
export DIB_DISTRIBUTION_MIRROR=$DIB_CENTOS_DISTRIBUTION_MIRROR
fi

3
diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
View File

@ -1,5 +1,2 @@
export DISTRO_NAME=fedora export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-25} export DIB_RELEASE=${DIB_RELEASE:-25}
if [ -n "${DIB_FEDORA_DISTRIBUTION_MIRROR:-}" ]; then
export DIB_DISTRIBUTION_MIRROR=$DIB_FEDORA_DISTRIBUTION_MIRROR
fi

4
diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash
View File

@ -2,10 +2,6 @@ export DISTRO_NAME=ubuntu
export DIB_RELEASE=${DIB_RELEASE:-xenial} export DIB_RELEASE=${DIB_RELEASE:-xenial}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe}
if [ -n "${DIB_UBUNTU_DISTRIBUTION_MIRROR:-}" ]; then
DIB_DISTRIBUTION_MIRROR=$DIB_UBUNTU_DISTRIBUTION_MIRROR
fi
# There are two default distro mirrors depending on architecture # There are two default distro mirrors depending on architecture
ARCH=${ARCH:-} ARCH=${ARCH:-}
if [[ "arm64 armhf powerpc ppc64el s390x" =~ "$ARCH" ]]; then if [[ "arm64 armhf powerpc ppc64el s390x" =~ "$ARCH" ]]; then

9
releasenotes/notes/dib-distribution-mirror-8c241c0d3d4a539a.yaml Normal file
View File

@ -0,0 +1,9 @@
---
deprecations:
- The ``DIB_[DISTRO]_DISTRIBUTION_MIRROR`` variables have been
removed. These were undocumented ways to set
``DIB_DISTRIBUTION_MIRROR`` for some elements. It was not
implemented consistently and causing some confusion. If you need
to setup mirrors for testing purposes, the
``openstack-ci-mirrors`` element is a good example that is used by
OpenStack gate testing.