openstack/kolla
Code Issues Proposed changes

Update Ceph repo name for dnf config-manager command

Browse Source 
Since change I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e we install the
centos-release-ceph-reef package as a dependency, but some code was
still expecting the quincy package.

Change-Id: I8ebcf815d80f3bead25e0078d69b34e17ad013bd
This commit is contained in:
Pierre Riteau 2023-11-22 05:52:05 +00:00
parent d86cba116e
commit 33c988a6ce
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -146,7 +146,7 @@ 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 = [
'centos-ceph-quincy', 'centos-ceph-reef',
'centos-nfv-openvswitch', 'centos-nfv-openvswitch',
'centos-opstools', 'centos-opstools',
'centos-rabbitmq-38', 'centos-rabbitmq-38',

6
docker/base/ci-centos.repo
View File

@ -38,9 +38,9 @@ gpgcheck=1
repo_gpgcheck=0 repo_gpgcheck=0
enabled=0 enabled=0
[centos-ceph-quincy] [centos-ceph-reef]
name=(OpenDev mirror) CentOS-$stream - Ceph Quincy name=(OpenDev mirror) CentOS-$stream - Ceph Reef
baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage

6
docker/base/ci-rocky.repo
View File

@ -1,6 +1,6 @@
[centos-ceph-quincy] [centos-ceph-reef]
name=(OpenDev mirror) CentOS-$stream - Ceph Quincy name=(OpenDev mirror) CentOS-$stream - Ceph Reef
baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage

2
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cinder') }} {{ macros.configure_user(name='cinder') }}
{{ macros.enable_extra_repos(['ceph']) }} {{ macros.enable_extra_repos(['ceph', 'epel']) }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [

2
docker/manila/manila-share/Dockerfile.j2
View File

@ -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(['ceph']) }} {{ macros.enable_extra_repos(['ceph', 'epel']) }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set manila_share_packages = [ {% set manila_share_packages = [

2
docker/nova/nova-compute/Dockerfile.j2
View File

@ -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(['ceph', 'libvirt']) }} {{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt']) }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}

2
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='nova', groups='qemu') }} {{ macros.configure_user(name='nova', groups='qemu') }}
{{ macros.enable_extra_repos(['ceph', 'libvirt', 'openvswitch']) }} {{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}

2
docker/zun/zun-compute/Dockerfile.j2
View File

@ -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(['ceph']) }} {{ macros.enable_extra_repos(['ceph', 'epel']) }}
{% set zun_compute_packages = [ {% set zun_compute_packages = [
'ceph-common', 'ceph-common',

8
kolla/template/repos.yaml
View File

@ -1,6 +1,6 @@
--- ---
centos: centos:
ceph: "centos-ceph-quincy" ceph: "centos-ceph-reef"
crb: "crb" crb: "crb"
epel: "epel" epel: "epel"
erlang: "rabbitmq_rabbitmq-erlang" erlang: "rabbitmq_rabbitmq-erlang"
@ -18,7 +18,7 @@ centos:
td-agent: "treasuredata" td-agent: "treasuredata"
centos-aarch64: centos-aarch64:
ceph: "centos-ceph-quincy" ceph: "centos-ceph-reef"
crb: "crb" crb: "crb"
epel: "epel" epel: "epel"
erlang: "copr-hrw-erlang-for-rabbitmq" erlang: "copr-hrw-erlang-for-rabbitmq"
@ -136,7 +136,7 @@ debian-aarch64:
gpg_key: "treasuredata.asc" gpg_key: "treasuredata.asc"
rocky: rocky:
ceph: "centos-ceph-quincy" ceph: "centos-ceph-reef"
crb: "crb" crb: "crb"
epel: "epel" epel: "epel"
erlang: "rabbitmq_rabbitmq-erlang" erlang: "rabbitmq_rabbitmq-erlang"
@ -154,7 +154,7 @@ rocky:
td-agent: "treasuredata" td-agent: "treasuredata"
rocky-aarch64: rocky-aarch64:
ceph: "centos-ceph-quincy" ceph: "centos-ceph-reef"
crb: "crb" crb: "crb"
epel: "epel" epel: "epel"
erlang: "copr-hrw-erlang-for-rabbitmq" erlang: "copr-hrw-erlang-for-rabbitmq"

4
kolla/tests/test_methods.py
View File

@ -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-quincy || true' expectCmd += '--enable centos-ceph-reef || true'
self.assertEqual(expectCmd, result) self.assertEqual(expectCmd, result)
def test_enable_repos_debian(self): def test_enable_repos_debian(self):
@ -167,7 +167,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-quincy || true' expectCmd += '--disable centos-ceph-reef || 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