openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Remove DIB_[DISTRO]_DISTRIBUTION_MIRROR"

This commit is contained in:
Jenkins 2017-07-22 05:22:03 +00:00 committed by Gerrit Code Review
parent f9700225b9 3457d2f8e8
commit e029af993b
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
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 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_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
ARCH=${ARCH:-}
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.