From bab770a88bee147e655a876a92a8d3b8711c9861 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 16 Mar 2020 15:26:06 +0000
Subject: [PATCH] CentOS 8: Use master image tag by default
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
---
ansible/group_vars/all.yml | 3 +--
etc/kolla/globals.yml | 2 +-
tools/setup_gate.sh | 9 +--------
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 865d496945..d065f3bee8 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -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"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index c334431cd2..524edaa244 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -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"
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index c06a0bb88d..d9c2e312ec 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -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