Move to CentOS Stream 9
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go. This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is planned as final solution. CI moved to CentOS Stream 9 nodes. Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715 Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
This commit is contained in:
parent
ea3ed3f933
commit
878b00013b
|
@ -55,10 +55,10 @@
|
||||||
0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
|
0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-centos8-stream
|
name: kolla-centos-9-stream
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: centos-8-stream
|
label: centos-9-stream
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ubuntu-jammy
|
name: kolla-ubuntu-jammy
|
||||||
|
@ -73,10 +73,10 @@
|
||||||
label: debian-bullseye
|
label: debian-bullseye
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-centos8-stream-aarch64
|
name: kolla-centos-9-stream-aarch64
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: centos-8-stream-arm64
|
label: centos-9-stream-arm64
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-debian-bullseye-aarch64
|
name: kolla-debian-bullseye-aarch64
|
||||||
|
|
|
@ -1,43 +1,41 @@
|
||||||
---
|
---
|
||||||
- job:
|
- project:
|
||||||
name: kolla-build-centos8s
|
check:
|
||||||
parent: kolla-base
|
jobs:
|
||||||
nodeset: kolla-centos8-stream
|
- kolla-build-centos9s
|
||||||
vars:
|
- kolla-ansible-centos9s-source:
|
||||||
base_distro: centos
|
vars:
|
||||||
base_distro_version: stream8
|
kolla_python_version: "3.9"
|
||||||
|
check-arm64:
|
||||||
|
jobs:
|
||||||
|
- kolla-build-centos9s-aarch64
|
||||||
|
gate:
|
||||||
|
jobs:
|
||||||
|
- kolla-build-centos9s
|
||||||
|
- kolla-ansible-centos9s-source:
|
||||||
|
vars:
|
||||||
|
kolla_python_version: "3.9"
|
||||||
|
experimental:
|
||||||
|
jobs:
|
||||||
|
- kolla-build-no-infra-wheels-centos9s
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kolla-build-centos8s-aarch64
|
name: kolla-build-centos9s
|
||||||
parent: kolla-build-centos8s
|
parent: kolla-base
|
||||||
nodeset: kolla-centos8-stream-aarch64
|
nodeset: kolla-centos-9-stream
|
||||||
|
vars:
|
||||||
|
base_distro: centos
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kolla-publish-centos8s-dockerhub
|
name: kolla-build-centos9s-aarch64
|
||||||
parent: kolla-build-centos8s
|
parent: kolla-build-centos9s
|
||||||
post-run: tests/playbooks/publish.yml
|
nodeset: kolla-centos-9-stream-aarch64
|
||||||
vars:
|
voting: false
|
||||||
publisher: true
|
|
||||||
kolla_registry: dockerhub
|
|
||||||
kolla_namespace: kolla
|
|
||||||
secrets:
|
|
||||||
- kolla_dockerhub_creds
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kolla-publish-centos8s-quay
|
name: kolla-build-no-infra-wheels-centos9s
|
||||||
parent: kolla-build-centos8s
|
|
||||||
post-run: tests/playbooks/publish.yml
|
|
||||||
vars:
|
|
||||||
publisher: true
|
|
||||||
kolla_registry: quay.io
|
|
||||||
kolla_namespace: openstack.kolla
|
|
||||||
secrets:
|
|
||||||
- kolla_quay_io_creds
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: kolla-build-no-infra-wheels-centos8s
|
|
||||||
parent: kolla-build-no-infra-wheels-base
|
parent: kolla-build-no-infra-wheels-base
|
||||||
nodeset: kolla-centos8-stream
|
nodeset: kolla-centos-9-stream
|
||||||
vars:
|
vars:
|
||||||
base_distro: centos
|
base_distro: centos
|
||||||
|
|
|
@ -62,10 +62,14 @@ COPY dnf.conf /etc/dnf/dnf.conf
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
#### BEGIN REPO ENABLEMENT
|
#### BEGIN REPO ENABLEMENT
|
||||||
|
{#
|
||||||
|
Repo files not available for CentOS Stream 9:
|
||||||
|
'elasticsearch.repo', # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
|
||||||
|
'grafana.repo', # signed with SHA1 key https://github.com/grafana/grafana/issues/41036
|
||||||
|
'proxysql.repo', # no repository yet for RHEL9 family
|
||||||
|
#}
|
||||||
{% set base_yum_repo_files = [
|
{% set base_yum_repo_files = [
|
||||||
'elasticsearch.repo',
|
'mariadb.repo',
|
||||||
'grafana.repo',
|
|
||||||
'proxysql.repo',
|
|
||||||
'rabbitmq_rabbitmq-server.repo',
|
'rabbitmq_rabbitmq-server.repo',
|
||||||
'td.repo',
|
'td.repo',
|
||||||
] %}
|
] %}
|
||||||
|
@ -73,35 +77,41 @@ COPY dnf.conf /etc/dnf/dnf.conf
|
||||||
{% set base_yum_url_packages = [
|
{% set base_yum_url_packages = [
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% set base_yum_repo_keys = [
|
{#
|
||||||
|
SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
|
||||||
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
|
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
|
||||||
'https://packages.grafana.com/gpg.key',
|
'https://packages.grafana.com/gpg.key',
|
||||||
|
#}
|
||||||
|
{% set base_yum_repo_keys = [
|
||||||
'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
|
'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
|
||||||
'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key',
|
|
||||||
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
|
|
||||||
'https://packages.treasuredata.com/GPG-KEY-td-agent',
|
'https://packages.treasuredata.com/GPG-KEY-td-agent',
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% if base_arch == 'x86_64' %}
|
{% if base_arch == 'x86_64' %}
|
||||||
{% set base_yum_repo_files = base_yum_repo_files + [
|
{% set base_yum_repo_files = base_yum_repo_files + [
|
||||||
'influxdb.repo',
|
'influxdb.repo',
|
||||||
'mariadb.repo',
|
|
||||||
'rabbitmq_rabbitmq-erlang.repo',
|
'rabbitmq_rabbitmq-erlang.repo',
|
||||||
] %}
|
] %}
|
||||||
# FIXME(mgoddard): Not available for CentOS 8 yet.
|
# FIXME(mgoddard): Not available for CentOS 8 yet.
|
||||||
# 'crmsh.repo',
|
# 'crmsh.repo',
|
||||||
|
|
||||||
{% set base_yum_repo_keys = base_yum_repo_keys + [
|
{% set base_yum_repo_keys = base_yum_repo_keys + [
|
||||||
|
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
|
||||||
'https://repos.influxdata.com/influxdb.key',
|
'https://repos.influxdata.com/influxdb.key',
|
||||||
] %}
|
] %}
|
||||||
{% elif base_arch == 'aarch64' %}
|
{% elif base_arch == 'aarch64' %}
|
||||||
{% set base_yum_repo_files = base_yum_repo_files + [
|
{#
|
||||||
|
Repo files not available for CentOS Stream 9:
|
||||||
'erlang-solutions.repo',
|
'erlang-solutions.repo',
|
||||||
'mariadb-aarch64.repo',
|
#}
|
||||||
|
{% set base_yum_repo_files = base_yum_repo_files + [
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% set base_yum_repo_keys = base_yum_repo_keys + [
|
{#
|
||||||
|
SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
|
||||||
'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
|
'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
|
||||||
|
#}
|
||||||
|
{% set base_yum_repo_keys = base_yum_repo_keys + [
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -150,8 +160,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% set base_centos_yum_repo_packages = [
|
{% set base_centos_yum_repo_packages = [
|
||||||
'centos-release-ceph-pacific',
|
'centos-release-ceph-quincy',
|
||||||
'centos-release-nfv-extras',
|
|
||||||
'centos-release-nfv-openvswitch',
|
'centos-release-nfv-openvswitch',
|
||||||
'centos-release-opstools',
|
'centos-release-opstools',
|
||||||
'epel-release',
|
'epel-release',
|
||||||
|
@ -168,20 +177,26 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
|
||||||
# from delorean or rdo-release-* package
|
# from delorean or rdo-release-* package
|
||||||
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
|
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
|
||||||
{% set base_centos_yum_repos_to_disable = [
|
{% set base_centos_yum_repos_to_disable = [
|
||||||
'advanced-virtualization',
|
'centos-ceph-quincy',
|
||||||
'centos-nfv-extras',
|
|
||||||
'centos-nfv-ovs',
|
|
||||||
'centos-ceph-pacific',
|
|
||||||
'centos-nfv-openvswitch',
|
'centos-nfv-openvswitch',
|
||||||
'centos-opstools',
|
'centos-opstools',
|
||||||
|
'centos9-nfv-ovs',
|
||||||
|
'centos9-opstools',
|
||||||
|
'centos9-rabbitmq',
|
||||||
|
'centos9-storage',
|
||||||
'epel',
|
'epel',
|
||||||
'epel-modular',
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% if base_arch == 'x86_64' %}
|
{% if base_arch == 'x86_64' %}
|
||||||
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
|
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
|
||||||
'influxdb',
|
'influxdb',
|
||||||
] %}
|
] %}
|
||||||
|
{% elif base_arch == 'aarch64' %}
|
||||||
|
|
||||||
|
{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}
|
||||||
|
|
||||||
|
RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
|
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
|
||||||
|
@ -204,9 +219,9 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
|
||||||
|
|
||||||
{% block base_redhat_binary_versionlock %}{% endblock %}
|
{% block base_redhat_binary_versionlock %}{% endblock %}
|
||||||
|
|
||||||
|
{# NOTE(hrw): CentOS Stream 9 has curl-minimal, Rocky Linux 9 has curl so we do not install any #}
|
||||||
{% set base_centos_packages = [
|
{% set base_centos_packages = [
|
||||||
'ca-certificates',
|
'ca-certificates',
|
||||||
'curl',
|
|
||||||
'dumb-init',
|
'dumb-init',
|
||||||
'findutils',
|
'findutils',
|
||||||
'hostname',
|
'hostname',
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
[mariadb]
|
|
||||||
name = MariaDB Server
|
|
||||||
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/aarch64
|
|
||||||
gpgcheck = 1
|
|
||||||
enabled = 0
|
|
||||||
module_hotfixes = 1
|
|
|
@ -1,6 +1,6 @@
|
||||||
[mariadb]
|
[mariadb]
|
||||||
name = MariaDB Server
|
name = MariaDB Server
|
||||||
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/x86_64
|
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/$releasever/$basearch
|
||||||
gpgcheck = 1
|
gpgcheck = 1
|
||||||
enabled = 0
|
enabled = 0
|
||||||
module_hotfixes = 1
|
module_hotfixes = 1
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
[rabbitmq_rabbitmq-erlang]
|
[rabbitmq_rabbitmq-erlang]
|
||||||
name=rabbitmq_rabbitmq-erlang
|
name=rabbitmq_rabbitmq-erlang
|
||||||
|
# https://www.rabbitmq.com/install-rpm.html lists "el/8" for CentOS Stream 9
|
||||||
baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
|
baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
enabled=0
|
enabled=0
|
||||||
|
|
|
@ -12,6 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{# NOTE(mgoddard): EPEL required for nginx #}
|
{# NOTE(mgoddard): EPEL required for nginx #}
|
||||||
{{ macros.enable_extra_repos(['epel']) }}
|
{{ macros.enable_extra_repos(['epel']) }}
|
||||||
|
|
||||||
|
{% set bifrost_base_packages = [
|
||||||
|
'cpio',
|
||||||
|
] %}
|
||||||
|
|
||||||
|
{{ macros.install_packages(bifrost_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
ENV VENV /var/lib/kolla/venv
|
ENV VENV /var/lib/kolla/venv
|
||||||
|
|
||||||
{% set bifrost_base_pip_packages = [
|
{% set bifrost_base_pip_packages = [
|
||||||
|
|
|
@ -30,12 +30,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'collectd-dbi',
|
'collectd-dbi',
|
||||||
'collectd-disk',
|
'collectd-disk',
|
||||||
'collectd-dns',
|
'collectd-dns',
|
||||||
'collectd-generic-jmx',
|
|
||||||
'collectd-ipmi',
|
'collectd-ipmi',
|
||||||
'collectd-log_logstash',
|
'collectd-log_logstash',
|
||||||
'collectd-logparser',
|
'collectd-logparser',
|
||||||
'collectd-mcelog',
|
'collectd-mcelog',
|
||||||
'collectd-memcachec',
|
|
||||||
'collectd-mysql',
|
'collectd-mysql',
|
||||||
'collectd-netlink',
|
'collectd-netlink',
|
||||||
'collectd-openldap',
|
'collectd-openldap',
|
||||||
|
@ -59,7 +57,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_arch =='x86_64' %}
|
{% if base_arch =='x86_64' %}
|
||||||
{% set collectd_packages = collectd_packages + [
|
{% set collectd_packages = collectd_packages + [
|
||||||
'collectd-hugepages',
|
'collectd-hugepages',
|
||||||
'collectd-iptables',
|
|
||||||
'collectd-pcie-errors',
|
'collectd-pcie-errors',
|
||||||
'collectd-pmu',
|
'collectd-pmu',
|
||||||
'collectd-rdt',
|
'collectd-rdt',
|
||||||
|
|
|
@ -12,6 +12,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'cronie',
|
'cronie',
|
||||||
'logrotate'
|
'logrotate'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
|
# NOTE(hrw): In RHEL 9 family it is done by systemd timer, we want cron to
|
||||||
|
# handle it.
|
||||||
|
COPY logrotate /etc/cron.daily/logrotate
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set cron_packages = [
|
{% set cron_packages = [
|
||||||
'cron',
|
'cron',
|
||||||
|
|
|
@ -3,15 +3,19 @@
|
||||||
CRON_LOGROTATE_CURRENT_PATH="$(find /etc/cron* -name logrotate)"
|
CRON_LOGROTATE_CURRENT_PATH="$(find /etc/cron* -name logrotate)"
|
||||||
CRON_LOGROTATE_CURRENT_SCHEDULE=$(echo "${CRON_LOGROTATE_CURRENT_PATH}" | sed -r 's/(.*)(hourly|daily|weekly|monthly)(.*)/\2/g')
|
CRON_LOGROTATE_CURRENT_SCHEDULE=$(echo "${CRON_LOGROTATE_CURRENT_PATH}" | sed -r 's/(.*)(hourly|daily|weekly|monthly)(.*)/\2/g')
|
||||||
|
|
||||||
# Pass only for hourly|daily|weekly|monthly
|
if [ -z $CRON_LOGROTATE_CURRENT_PATH ]; then
|
||||||
if [[ "${KOLLA_LOGROTATE_SCHEDULE:-undefined}" =~ hourly|daily|weekly|monthly ]]; then
|
echo "logrotate is not handled by cron"
|
||||||
|
else
|
||||||
|
# Pass only for hourly|daily|weekly|monthly
|
||||||
|
if [[ "${KOLLA_LOGROTATE_SCHEDULE:-undefined}" =~ hourly|daily|weekly|monthly ]]; then
|
||||||
|
|
||||||
CRON_LOGROTATE_DESIRED_PATH="/etc/cron.${KOLLA_LOGROTATE_SCHEDULE}/logrotate"
|
CRON_LOGROTATE_DESIRED_PATH="/etc/cron.${KOLLA_LOGROTATE_SCHEDULE}/logrotate"
|
||||||
|
|
||||||
if [[ "${CRON_LOGROTATE_CURRENT_PATH}" != "${CRON_LOGROTATE_DESIRED_PATH}" ]]; then
|
if [[ "${CRON_LOGROTATE_CURRENT_PATH}" != "${CRON_LOGROTATE_DESIRED_PATH}" ]]; then
|
||||||
mv ${CRON_LOGROTATE_CURRENT_PATH} ${CRON_LOGROTATE_DESIRED_PATH}
|
mv ${CRON_LOGROTATE_CURRENT_PATH} ${CRON_LOGROTATE_DESIRED_PATH}
|
||||||
CRON_LOGROTATE_CURRENT_SCHEDULE="${KOLLA_LOGROTATE_SCHEDULE}"
|
CRON_LOGROTATE_CURRENT_SCHEDULE="${KOLLA_LOGROTATE_SCHEDULE}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[i] Cron schedule for logrotate is currently set to: ${CRON_LOGROTATE_CURRENT_SCHEDULE}."
|
echo "[i] Cron schedule for logrotate is currently set to: ${CRON_LOGROTATE_CURRENT_SCHEDULE}."
|
||||||
|
fi
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# skip in favour of systemd timer
|
||||||
|
if [ -d /run/systemd/system ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# this cronjob persists removals (but not purges)
|
||||||
|
if [ ! -x /usr/sbin/logrotate ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
/usr/sbin/logrotate /etc/logrotate.conf
|
||||||
|
EXITVALUE=$?
|
||||||
|
if [ $EXITVALUE != 0 ]; then
|
||||||
|
/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
|
||||||
|
fi
|
||||||
|
exit $EXITVALUE
|
|
@ -7,7 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['powertools']) }}
|
|
||||||
{{ macros.configure_user(name='horizon') }}
|
{{ macros.configure_user(name='horizon') }}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
|
@ -26,8 +26,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
|
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
|
||||||
|
|
||||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
|
# NOTE(hrw): CentOS Stream 9 lacks initiatorname.iscsi file
|
||||||
RUN chmod 644 /usr/local/bin/kolla_extend_start \
|
RUN chmod 644 /usr/local/bin/kolla_extend_start \
|
||||||
&& rm /etc/iscsi/initiatorname.iscsi
|
&& rm -f /etc/iscsi/initiatorname.iscsi
|
||||||
|
|
||||||
{% block iscsid_footer %}{% endblock %}
|
{% block iscsid_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
{% block footer %}{% endblock %}
|
||||||
|
|
|
@ -17,8 +17,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'openldap-devel',
|
'openldap-devel',
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
RUN dnf module enable mod_auth_openidc -y
|
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set keystone_base_packages = [
|
{% set keystone_base_packages = [
|
||||||
'libapache2-mod-auth-mellon',
|
'libapache2-mod-auth-mellon',
|
||||||
|
|
|
@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.enable_extra_repos(['epel']) }}
|
{{ macros.enable_extra_repos(['epel']) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['erlang', 'openvswitch', 'powertools', 'rabbitmq']) }}
|
{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.configure_user(name='mysql') }}
|
{{ macros.configure_user(name='mysql') }}
|
||||||
|
|
||||||
{# NOTE(mgoddard): EPEL required for pv package #}
|
{# NOTE(mgoddard): EPEL required for pv package #}
|
||||||
{{ macros.enable_extra_repos(['epel']) }}
|
{{ macros.enable_extra_repos(['epel', 'mariadb']) }}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set mariadb_packages = [
|
{% set mariadb_packages = [
|
||||||
|
|
|
@ -6,26 +6,28 @@ fi
|
||||||
if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then
|
if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then
|
||||||
chmod 755 /var/log/kolla/neutron
|
chmod 755 /var/log/kolla/neutron
|
||||||
fi
|
fi
|
||||||
if [[ ${KOLLA_BASE_DISTRO} == "centos" ]]; then
|
|
||||||
export UPDATE_ALTERNATIVES="/usr/sbin/update-alternatives"
|
|
||||||
else
|
|
||||||
export UPDATE_ALTERNATIVES="/usr/bin/update-alternatives"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# set legacy iptables to allow kernels not supporting iptables-nft
|
# NOTE(hrw): from RHEL 9 release notes:
|
||||||
# CentOS has update-alternatives 1.13, so use --display (not --query)
|
# "Iptables-nft and ipset are now deprecated, which included the utilities,
|
||||||
if $UPDATE_ALTERNATIVES --display iptables; then
|
# iptables, ip6tables, ebtables, and arptables. These are all replaced by the
|
||||||
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
|
# nftables framework."
|
||||||
# the workaround below ensures it gets set to `false` in such cases to fix
|
# so no need to even use u-a on RHEL 9 family as there is one provider
|
||||||
# this code under `set -o nounset`.
|
# (and there is no u-a for ip6tables so script fails)
|
||||||
KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false}
|
|
||||||
|
|
||||||
if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then
|
if [[ ${KOLLA_BASE_DISTRO} != "centos" ]]; then
|
||||||
sudo $UPDATE_ALTERNATIVES --set iptables /usr/sbin/iptables-legacy
|
if /usr/bin/update-alternatives --display iptables; then
|
||||||
sudo $UPDATE_ALTERNATIVES --set ip6tables /usr/sbin/ip6tables-legacy
|
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
|
||||||
else
|
# the workaround below ensures it gets set to `false` in such cases to fix
|
||||||
sudo $UPDATE_ALTERNATIVES --auto iptables
|
# this code under `set -o nounset`.
|
||||||
sudo $UPDATE_ALTERNATIVES --auto ip6tables
|
KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false}
|
||||||
|
|
||||||
|
if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then
|
||||||
|
sudo /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy
|
||||||
|
sudo /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
|
||||||
|
else
|
||||||
|
sudo /usr/bin/update-alternatives --auto iptables
|
||||||
|
sudo /usr/bin/update-alternatives --auto ip6tables
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -42,9 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \
|
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
|
||||||
&& dnf remove -y linux-firmware \
|
|
||||||
&& dnf clean all
|
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'openvswitch',
|
'openvswitch',
|
||||||
'qemu-img',
|
'qemu-img',
|
||||||
'qemu-kvm',
|
'qemu-kvm',
|
||||||
'trousers'
|
|
||||||
] %}
|
] %}
|
||||||
{% if base_arch == 'x86_64' %}
|
{% if base_arch == 'x86_64' %}
|
||||||
{% set nova_libvirt_packages = nova_libvirt_packages + [
|
{% set nova_libvirt_packages = nova_libvirt_packages + [
|
||||||
|
|
|
@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['opstools', 'powertools']) }}
|
{{ macros.enable_extra_repos(['crb']) }}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set openstack_base_packages = [
|
{% set openstack_base_packages = [
|
||||||
|
@ -55,7 +55,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['powertools']) }}
|
|
||||||
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% set openstack_base_pip_packages = [
|
{% set openstack_base_pip_packages = [
|
||||||
|
|
|
@ -5,6 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
|
{{ macros.enable_extra_repos(['crb']) }}
|
||||||
|
|
||||||
{% block prometheus_libvirt_exporter_header %}{% endblock %}
|
{% block prometheus_libvirt_exporter_header %}{% endblock %}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
|
@ -14,7 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.enable_extra_repos(['epel']) }}
|
{{ macros.enable_extra_repos(['epel']) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['erlang', 'powertools', 'rabbitmq']) }}
|
{{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
|
||||||
|
|
||||||
{% block rabbitmq_install %}
|
{% block rabbitmq_install %}
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
|
@ -7,7 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['powertools']) }}
|
|
||||||
{{ macros.configure_user(name='vitrage') }}
|
{{ macros.configure_user(name='vitrage') }}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
|
@ -7,7 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{{ macros.enable_extra_repos(['powertools']) }}
|
|
||||||
{{ macros.configure_user(name='watcher') }}
|
{{ macros.configure_user(name='watcher') }}
|
||||||
|
|
||||||
ADD watcher-base-archive /watcher-base-source
|
ADD watcher-base-archive /watcher-base-source
|
||||||
|
|
|
@ -24,22 +24,20 @@ from kolla.version import version_info as version
|
||||||
BASE_OS_DISTRO = ['centos', 'debian', 'ubuntu']
|
BASE_OS_DISTRO = ['centos', 'debian', 'ubuntu']
|
||||||
BASE_ARCH = ['x86_64', 'aarch64']
|
BASE_ARCH = ['x86_64', 'aarch64']
|
||||||
DEFAULT_BASE_TAGS = {
|
DEFAULT_BASE_TAGS = {
|
||||||
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'},
|
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
|
||||||
'debian': {'name': 'debian', 'tag': 'bullseye'},
|
'debian': {'name': 'debian', 'tag': 'bullseye'},
|
||||||
'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
|
'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
|
||||||
}
|
}
|
||||||
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
|
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
|
||||||
DISTRO_PRETTY_NAME = {
|
DISTRO_PRETTY_NAME = {
|
||||||
'centos': 'CentOS Stream 8',
|
'centos': 'CentOS Stream 9',
|
||||||
'debian': 'Debian GNU/Linux 11 (bullseye)',
|
'debian': 'Debian GNU/Linux 11 (bullseye)',
|
||||||
'ubuntu': 'Ubuntu 22.04',
|
'ubuntu': 'Ubuntu 22.04',
|
||||||
}
|
}
|
||||||
OPENSTACK_RELEASE = 'master'
|
OPENSTACK_RELEASE = 'master'
|
||||||
|
|
||||||
# This is noarch repository so we will use it on all architectures
|
# This is noarch repository so we will use it on all architectures
|
||||||
DELOREAN = "https://trunk.rdoproject.org/centos8-yoga/" \
|
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \
|
||||||
"consistent/delorean.repo"
|
|
||||||
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-yoga/" \
|
|
||||||
"delorean-deps.repo"
|
"delorean-deps.repo"
|
||||||
|
|
||||||
INSTALL_TYPE_CHOICES = ['source']
|
INSTALL_TYPE_CHOICES = ['source']
|
||||||
|
@ -270,7 +268,7 @@ _BASE_OPTS = [
|
||||||
help=('Set the package type of the distro. If not set then '
|
help=('Set the package type of the distro. If not set then '
|
||||||
'the packaging type is set to "rpm" if a RHEL based '
|
'the packaging type is set to "rpm" if a RHEL based '
|
||||||
'distro and "deb" if a Debian based distro.')),
|
'distro and "deb" if a Debian based distro.')),
|
||||||
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
|
cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS],
|
||||||
help=('Comma separated list of .rpm or .repo file(s) '
|
help=('Comma separated list of .rpm or .repo file(s) '
|
||||||
'or URL(s) to install before building containers')),
|
'or URL(s) to install before building containers')),
|
||||||
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),
|
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),
|
||||||
|
|
|
@ -87,11 +87,19 @@ UNBUILDABLE_IMAGES = {
|
||||||
"skydive-base", # no aarch64 binary
|
"skydive-base", # no aarch64 binary
|
||||||
},
|
},
|
||||||
|
|
||||||
|
# Issues for SHA1 keys:
|
||||||
|
# https://github.com/elastic/elasticsearch/issues/85876
|
||||||
|
# https://github.com/grafana/grafana/issues/41036
|
||||||
'centos': {
|
'centos': {
|
||||||
|
"elasticsearch", # SHA1 gpg key
|
||||||
|
"grafana", # SHA1 gpg key
|
||||||
"hacluster-pcs", # Missing crmsh package
|
"hacluster-pcs", # Missing crmsh package
|
||||||
|
"kibana", # SHA1 gpg key
|
||||||
|
"logstash", # SHA1 gpg key
|
||||||
"nova-spicehtml5proxy", # Missing spicehtml5 package
|
"nova-spicehtml5proxy", # Missing spicehtml5 package
|
||||||
"ovsdpdk", # Not supported on CentOS
|
"ovsdpdk", # Not supported on CentOS
|
||||||
"tgtd", # Not supported on CentOS 8
|
"proxysql", # no binary package
|
||||||
|
"tgtd", # Not supported on CentOS
|
||||||
},
|
},
|
||||||
|
|
||||||
'debian': {
|
'debian': {
|
||||||
|
@ -623,7 +631,7 @@ class KollaWorker(object):
|
||||||
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
|
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
|
||||||
|
|
||||||
if self.base in ['centos']:
|
if self.base in ['centos']:
|
||||||
self.conf.distro_python_version = "3.6"
|
self.conf.distro_python_version = "3.9"
|
||||||
self.distro_package_manager = 'dnf'
|
self.distro_package_manager = 'dnf'
|
||||||
self.base_package_type = 'rpm'
|
self.base_package_type = 'rpm'
|
||||||
elif self.base in ['debian']:
|
elif self.base in ['debian']:
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
---
|
---
|
||||||
centos:
|
centos:
|
||||||
ceph: "centos-ceph-pacific"
|
ceph: "centos-ceph-quincy"
|
||||||
|
crb: "crb"
|
||||||
elasticsearch: "elasticsearch-kibana-logstash-7.x"
|
elasticsearch: "elasticsearch-kibana-logstash-7.x"
|
||||||
epel: "epel"
|
epel: "epel"
|
||||||
epel-modular: "epel-modular"
|
|
||||||
erlang: "rabbitmq_rabbitmq-erlang"
|
erlang: "rabbitmq_rabbitmq-erlang"
|
||||||
extras: "extras"
|
extras: "extras"
|
||||||
grafana: "grafana"
|
grafana: "grafana"
|
||||||
hacluster: "ha"
|
hacluster: "highavailability"
|
||||||
haproxy: "centos-nfv-extras"
|
haproxy: "centos-nfv-extras"
|
||||||
influxdb: "influxdb"
|
influxdb: "influxdb"
|
||||||
kibana: "elasticsearch-kibana-logstash-7.x"
|
kibana: "elasticsearch-kibana-logstash-7.x"
|
||||||
|
@ -15,27 +15,25 @@ centos:
|
||||||
mariadb: "mariadb"
|
mariadb: "mariadb"
|
||||||
openvswitch: "centos-nfv-openvswitch"
|
openvswitch: "centos-nfv-openvswitch"
|
||||||
opstools: "centos-opstools"
|
opstools: "centos-opstools"
|
||||||
powertools: "powertools"
|
|
||||||
proxysql: "proxysql"
|
proxysql: "proxysql"
|
||||||
rabbitmq: "rabbitmq_rabbitmq-server"
|
rabbitmq: "rabbitmq_rabbitmq-server"
|
||||||
td-agent: "treasuredata"
|
td-agent: "treasuredata"
|
||||||
|
|
||||||
centos-aarch64:
|
centos-aarch64:
|
||||||
ceph: "centos-ceph-pacific"
|
ceph: "centos-ceph-quincy"
|
||||||
|
crb: "crb"
|
||||||
elasticsearch: "elasticsearch-kibana-logstash-7.x"
|
elasticsearch: "elasticsearch-kibana-logstash-7.x"
|
||||||
epel: "epel"
|
epel: "epel"
|
||||||
epel-modular: "epel-modular"
|
|
||||||
erlang: "erlang-solutions"
|
erlang: "erlang-solutions"
|
||||||
extras: "extras"
|
extras: "extras"
|
||||||
grafana: "grafana"
|
grafana: "grafana"
|
||||||
hacluster: "ha"
|
hacluster: "highavailability"
|
||||||
haproxy: "centos-nfv-extras"
|
haproxy: "centos-nfv-extras"
|
||||||
kibana: "elasticsearch-kibana-logstash-7.x"
|
kibana: "elasticsearch-kibana-logstash-7.x"
|
||||||
logstash: "elasticsearch-kibana-logstash-7.x"
|
logstash: "elasticsearch-kibana-logstash-7.x"
|
||||||
mariadb: "mariadb"
|
mariadb: "mariadb"
|
||||||
openvswitch: "centos-nfv-openvswitch"
|
openvswitch: "centos-nfv-openvswitch"
|
||||||
opstools: "centos-opstools"
|
opstools: "centos-opstools"
|
||||||
powertools: "powertools"
|
|
||||||
proxysql: "proxysql"
|
proxysql: "proxysql"
|
||||||
rabbitmq: "rabbitmq_rabbitmq-server"
|
rabbitmq: "rabbitmq_rabbitmq-server"
|
||||||
td-agent: "treasuredata"
|
td-agent: "treasuredata"
|
||||||
|
|
|
@ -529,11 +529,10 @@ class KollaWorkerTest(base.TestCase):
|
||||||
self.assertEqual('3.10', kolla.distro_python_version)
|
self.assertEqual('3.10', kolla.distro_python_version)
|
||||||
|
|
||||||
def test_build_distro_python_version_centos(self):
|
def test_build_distro_python_version_centos(self):
|
||||||
"""check distro_python_version for CentOS 8.0.1905"""
|
"""check distro_python_version for CentOS Stream 9"""
|
||||||
self.conf.set_override('base', 'centos')
|
self.conf.set_override('base', 'centos')
|
||||||
self.conf.set_override('base_tag', '8.0.1905')
|
|
||||||
kolla = build.KollaWorker(self.conf)
|
kolla = build.KollaWorker(self.conf)
|
||||||
self.assertEqual('3.6', kolla.distro_python_version)
|
self.assertEqual('3.9', kolla.distro_python_version)
|
||||||
|
|
||||||
def test_build_distro_package_manager(self):
|
def test_build_distro_package_manager(self):
|
||||||
"""check distro_package_manager conf value is taken"""
|
"""check distro_package_manager conf value is taken"""
|
||||||
|
|
|
@ -55,7 +55,7 @@ class MethodsTest(base.TestCase):
|
||||||
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
|
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
|
||||||
'enable')
|
'enable')
|
||||||
expectCmd = 'RUN dnf config-manager --enable grafana '
|
expectCmd = 'RUN dnf config-manager --enable grafana '
|
||||||
expectCmd += '--enable centos-ceph-pacific || true'
|
expectCmd += '--enable centos-ceph-quincy || true'
|
||||||
self.assertEqual(expectCmd, result)
|
self.assertEqual(expectCmd, result)
|
||||||
|
|
||||||
def test_enable_repos_debian(self):
|
def test_enable_repos_debian(self):
|
||||||
|
@ -145,7 +145,7 @@ class MethodsTest(base.TestCase):
|
||||||
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
|
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
|
||||||
'disable')
|
'disable')
|
||||||
expectCmd = 'RUN dnf config-manager --disable grafana '
|
expectCmd = 'RUN dnf config-manager --disable grafana '
|
||||||
expectCmd += '--disable centos-ceph-pacific || true'
|
expectCmd += '--disable centos-ceph-quincy || true'
|
||||||
self.assertEqual(expectCmd, result)
|
self.assertEqual(expectCmd, result)
|
||||||
|
|
||||||
# NOTE(hrw): there is no disabling of repos for Debian/Ubuntu
|
# NOTE(hrw): there is no disabling of repos for Debian/Ubuntu
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
CentOS Stream 9 is now used instead of CentOS Stream 8.
|
|
@ -18,26 +18,24 @@
|
||||||
path: "{{ kolla_build_logs_dir }}"
|
path: "{{ kolla_build_logs_dir }}"
|
||||||
state: directory
|
state: directory
|
||||||
|
|
||||||
- name: Install Python3 setuptools and family
|
- name: Install Python3 pip and setuptools
|
||||||
package:
|
package:
|
||||||
name:
|
name:
|
||||||
- python3-pip
|
- python3-pip
|
||||||
- python3-setuptools
|
- python3-setuptools
|
||||||
- python3-virtualenv
|
|
||||||
- python3-wheel
|
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
# NOTE(hrw): On RedHat systems it is part of python3-virtualenv
|
# NOTE(hrw): On RedHat systems venv is part of python3-libs
|
||||||
- name: Install virtualenv on Debian systems
|
- name: Install Python3 venv on Debian systems
|
||||||
package:
|
package:
|
||||||
name:
|
name:
|
||||||
- virtualenv
|
- python3-venv
|
||||||
become: true
|
become: true
|
||||||
when:
|
when:
|
||||||
ansible_os_family == "Debian"
|
ansible_os_family == "Debian"
|
||||||
|
|
||||||
- name: Create virtualenv
|
- name: Create virtualenv
|
||||||
command: python3 -m virtualenv {{ virtualenv_path }} --python python3
|
command: python3 -m venv {{ virtualenv_path }}
|
||||||
|
|
||||||
- name: Install kolla
|
- name: Install kolla
|
||||||
command: "{{ virtualenv_path }}/bin/python -m pip install {{ zuul.project.src_dir }}"
|
command: "{{ virtualenv_path }}/bin/python -m pip install {{ zuul.project.src_dir }}"
|
||||||
|
@ -58,11 +56,11 @@
|
||||||
|
|
||||||
- name: Configure Docker repo for CentOS
|
- name: Configure Docker repo for CentOS
|
||||||
block:
|
block:
|
||||||
- name: Add Docker YUM repository
|
- name: Add Docker repository
|
||||||
yum_repository:
|
yum_repository:
|
||||||
name: docker
|
name: docker
|
||||||
description: Docker
|
description: Docker
|
||||||
baseurl: "{{ nodepool_docker_proxy }}/centos/7/$basearch/stable"
|
baseurl: "{{ nodepool_docker_proxy }}/centos/9/$basearch/stable"
|
||||||
enabled: yes
|
enabled: yes
|
||||||
gpgcheck: yes
|
gpgcheck: yes
|
||||||
gpgkey: "{{ nodepool_docker_proxy }}/centos/gpg"
|
gpgkey: "{{ nodepool_docker_proxy }}/centos/gpg"
|
||||||
|
|
|
@ -23,7 +23,7 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
|
||||||
RUN sed -i \
|
RUN sed -i \
|
||||||
-e "s|^\(mirrorlist.*\)|#\1|" \
|
-e "s|^\(mirrorlist.*\)|#\1|" \
|
||||||
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||||
/etc/yum.repos.d/CentOS-*.repo
|
/etc/yum.repos.d/centos*.repo
|
||||||
|
|
||||||
{% raw %}
|
{% raw %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -46,7 +46,7 @@ RUN sed -i \
|
||||||
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||||
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||||
-e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
-e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||||
/etc/yum.repos.d/CentOS-*.repo \
|
/etc/yum.repos.d/centos*.repo \
|
||||||
&& sed -i \
|
&& sed -i \
|
||||||
-e "s|^\(metalink.*\)|#\1|" \
|
-e "s|^\(metalink.*\)|#\1|" \
|
||||||
-e "s|^#baseurl=http://download.example/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
|
-e "s|^#baseurl=http://download.example/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||||
|
|
Loading…
Reference in New Issue