openstack/kolla-ansible
Code Issues Proposed changes

CentOS 8: Use master image tag by default

Browse Source 
While supporting both CentOS 7 and 8, we used the tag 'master-centos8'
for CentOS 8 images. We are now ready to drop CentOS 7 support, and
Kolla is switching to publish CentOS 8 images using the master tag on
the master branch, so we should use this.

Depends-On: https://review.opendev.org/713265

Partially-Implements: blueprint centos-rhel-8

Change-Id: I07d2c285e3214a6dc827a8e8eacf263048ee099b
This commit is contained in:
Mark Goddard 2020-03-16 15:26:06 +00:00
parent dd55cf6ed0
commit bab770a88b
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -484,8 +484,7 @@ admin_protocol: "{{ 'https' if kolla_enable_tls_internal | bool else 'http' }}"
openstack_release: "master"
# Docker image tag used by default.
openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"
# TODO(mgoddard): Set to an empty string when CentOS 7 is no longer supported.
openstack_tag_suffix: "{{ '' if kolla_base_distro != 'centos' or ansible_distribution_major_version == '7' else '-centos8' }}"
openstack_tag_suffix: ""
openstack_logging_debug: "False"
openstack_region_name: "RegionOne"

2
etc/kolla/globals.yml
View File

@ -24,7 +24,7 @@
#openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"
# Suffix applied to openstack_release to generate openstack_tag.
#openstack_tag_suffix: "{{ '' if base_distro != 'centos' or ansible_distribution_major_version == '7' else '-centos8' }}"
#openstack_tag_suffix: ""
# Location of configuration overrides
#node_custom_config: "/etc/kolla/config"

9
tools/setup_gate.sh
View File

@ -95,14 +95,7 @@ function prepare_images {
fi
sudo docker run -d -p 4000:5000 --restart=always -v /opt/kolla_registry/:/var/lib/registry --name registry registry:2
pushd "${KOLLA_SRC_DIR}"
# TODO(mgoddard): Remove this if block when CentOS 7 is no longer
# supported.
if [[ $BASE_DISTRO == "centos" ]] && [[ $BASE_DISTRO_MAJOR_VERSION -eq 8 ]]; then
kolla_base_distro=centos8
else
kolla_base_distro=${BASE_DISTRO}
fi
sudo tox -e "build-${kolla_base_distro}-${INSTALL_TYPE}"
sudo tox -e "build-${BASE_DISTRO}-${INSTALL_TYPE}"
# NOTE(yoctozepto): due to debian buster we push after images are built
# see https://github.com/docker/for-linux/issues/711
if [[ "debian" == $BASE_DISTRO ]]; then