diff options
| -rw-r--r-- | .zuul.d/base.yaml | 8 | ||||
| -rw-r--r-- | .zuul.d/centos.yaml | 44 | ||||
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rwxr-xr-x | kolla/common/config.py | 12 | ||||
| -rw-r--r-- | releasenotes/notes/centos-8-stream-b5b45ccee94f7cf5.yaml | 4 |
5 files changed, 41 insertions, 33 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 96a56da86..5cbfa3707 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -26,10 +26,10 @@ C/rWcxTKlGJjjlVFZfhRHHy6gWBYH/SoozkbpkWbk0g43SLSxAuITy7nqLggOU= - nodeset: - name: kolla-centos8 + name: kolla-centos8-stream nodes: - name: primary - label: centos-8 + label: centos-8-stream - nodeset: name: kolla-ubuntu-focal @@ -44,10 +44,10 @@ label: debian-buster - nodeset: - name: kolla-centos8-aarch64 + name: kolla-centos8-stream-aarch64 nodes: - name: primary - label: centos-8-arm64 + label: centos-8-stream-arm64 - nodeset: name: kolla-debian-buster-aarch64 diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index d00162165..e5be6d91a 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -2,32 +2,32 @@ - project: check: jobs: - - kolla-build-centos8-binary - - kolla-build-centos8-source + - kolla-build-centos8s-binary + - kolla-build-centos8s-source - kolla-ansible-centos8-source - kolla-ansible-centos8-binary - kolla-ansible-centos8-source-upgrade check-arm64: jobs: - - kolla-build-centos8-source-aarch64 + - kolla-build-centos8s-source-aarch64 gate: queue: kolla jobs: - - kolla-build-centos8-source + - kolla-build-centos8s-source - kolla-ansible-centos8-source - kolla-ansible-centos8-source-upgrade # NOTE(mgoddard): This can be switched to periodic to revert to daily publishing. periodic-weekly: jobs: - - kolla-publish-centos8-source - - kolla-publish-centos8-binary + - kolla-publish-centos8s-source + - kolla-publish-centos8s-binary release: jobs: - - kolla-publish-centos8-source - - kolla-publish-centos8-binary + - kolla-publish-centos8s-source + - kolla-publish-centos8s-binary experimental: jobs: - - kolla-build-no-infra-wheels-centos8-source + - kolla-build-no-infra-wheels-centos8s-source - kolla-ansible-centos8-source-bifrost: files: ^docker\/(base|bifrost|openstack-base)\/.* # Test rabbitmq & mariadb changes in multinode ceph jobs. @@ -55,17 +55,17 @@ files: ^docker/nova/ - job: - name: kolla-build-centos8-binary + name: kolla-build-centos8s-binary parent: kolla-base - nodeset: kolla-centos8 + nodeset: kolla-centos8-stream voting: false vars: base_distro: centos install_type: binary - job: - name: kolla-publish-centos8-binary - parent: kolla-build-centos8-binary + name: kolla-publish-centos8s-binary + parent: kolla-build-centos8s-binary post-run: tests/playbooks/publish.yml vars: publisher: true @@ -73,22 +73,22 @@ - kolla_dockerhub_creds - job: - name: kolla-build-centos8-source + name: kolla-build-centos8s-source parent: kolla-base - nodeset: kolla-centos8 + nodeset: kolla-centos8-stream vars: base_distro: centos install_type: source - job: - name: kolla-build-centos8-source-aarch64 - parent: kolla-build-centos8-source - nodeset: kolla-centos8-aarch64 + name: kolla-build-centos8s-source-aarch64 + parent: kolla-build-centos8s-source + nodeset: kolla-centos8-stream-aarch64 voting: false - job: - name: kolla-publish-centos8-source - parent: kolla-build-centos8-source + name: kolla-publish-centos8s-source + parent: kolla-build-centos8s-source post-run: tests/playbooks/publish.yml vars: publisher: true @@ -96,9 +96,9 @@ - kolla_dockerhub_creds - job: - name: kolla-build-no-infra-wheels-centos8-source + name: kolla-build-no-infra-wheels-centos8s-source parent: kolla-build-no-infra-wheels-base - nodeset: kolla-centos8 + nodeset: kolla-centos8-stream vars: base_distro: centos install_type: source diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2af50509f..151e86440 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -143,7 +143,10 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \ 'glibc-all-langpacks' ] %} -RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \ +# NOTE(hrw): this macro file drops all languages other than C.UTF-8 so horizon fails +# https://bugzilla.redhat.com/show_bug.cgi?id=1729770 +RUN rm -f /etc/rpm/macros.image-language-conf \ + && {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \ && {{ macros.rpm_security_update(clean_package_cache) }} {% endblock %} @@ -248,6 +251,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen 'ca-certificates', 'curl', 'findutils', + 'hostname', 'iproute', 'iscsi-initiator-utils', 'lvm2', diff --git a/kolla/common/config.py b/kolla/common/config.py index a54520ba6..9092b0b77 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -22,10 +22,10 @@ from kolla.version import version_info as version BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian'] BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64'] DEFAULT_BASE_TAGS = { - 'centos': '8', - 'rhel': '8', - 'debian': '10', - 'ubuntu': '20.04', + 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'}, + 'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'}, + 'debian': {'name': 'debian', 'tag': '10'}, + 'ubuntu': {'name': 'ubuntu', 'tag': '20.04'}, } DISTRO_RELEASE = { 'centos': '8', @@ -1119,10 +1119,10 @@ def parse(conf, args, usage=None, prog=None, # NOTE(jeffrey4l): set the default base tag based on the # base option - conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base)) + conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag']) prefix = '' if conf.openstack_release == 'master' else 'stable-' openstack_branch = '{}{}'.format(prefix, conf.openstack_release) conf.set_default('openstack_branch', openstack_branch) if not conf.base_image: - conf.base_image = conf.base + conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name'] diff --git a/releasenotes/notes/centos-8-stream-b5b45ccee94f7cf5.yaml b/releasenotes/notes/centos-8-stream-b5b45ccee94f7cf5.yaml new file mode 100644 index 000000000..372c59a96 --- /dev/null +++ b/releasenotes/notes/centos-8-stream-b5b45ccee94f7cf5.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + CentOS images are using CentOS 8 Stream as a base. |