Skip to content

Commit 4e95910

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Update Ceph repo name for dnf config-manager command"
2 parents c96965d + 33c988a commit 4e95910

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
146146
# from delorean or rdo-release-* package
147147
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
148148
{% set base_centos_yum_repos_to_disable = [
149-
'centos-ceph-quincy',
149+
'centos-ceph-reef',
150150
'centos-nfv-openvswitch',
151151
'centos-opstools',
152152
'centos-rabbitmq-38',

docker/base/ci-centos.repo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ gpgcheck=1
3838
repo_gpgcheck=0
3939
enabled=0
4040

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

docker/base/ci-rocky.repo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[centos-ceph-quincy]
2-
name=(OpenDev mirror) CentOS-$stream - Ceph Quincy
3-
baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/
1+
[centos-ceph-reef]
2+
name=(OpenDev mirror) CentOS-$stream - Ceph Reef
3+
baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/
44
gpgcheck=1
55
enabled=0
66
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage

docker/cinder/cinder-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
99

1010
{{ macros.configure_user(name='cinder') }}
1111

12-
{{ macros.enable_extra_repos(['ceph']) }}
12+
{{ macros.enable_extra_repos(['ceph', 'epel']) }}
1313

1414
{% if base_package_type == 'rpm' %}
1515
{% set cinder_base_packages = [

docker/manila/manila-share/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['ceph']) }}
10+
{{ macros.enable_extra_repos(['ceph', 'epel']) }}
1111

1212
{% if base_package_type == 'rpm' %}
1313
{% set manila_share_packages = [

docker/nova/nova-compute/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['ceph', 'libvirt']) }}
10+
{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt']) }}
1111

1212
{% if base_package_type == 'rpm' %}
1313

docker/nova/nova-libvirt/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
99

1010
{{ macros.configure_user(name='nova', groups='qemu') }}
1111

12-
{{ macros.enable_extra_repos(['ceph', 'libvirt', 'openvswitch']) }}
12+
{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }}
1313

1414
{% if base_package_type == 'rpm' %}
1515

docker/zun/zun-compute/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.enable_extra_repos(['ceph']) }}
10+
{{ macros.enable_extra_repos(['ceph', 'epel']) }}
1111

1212
{% set zun_compute_packages = [
1313
'ceph-common',

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
centos:
3-
ceph: "centos-ceph-quincy"
3+
ceph: "centos-ceph-reef"
44
crb: "crb"
55
epel: "epel"
66
erlang: "rabbitmq_rabbitmq-erlang"
@@ -18,7 +18,7 @@ centos:
1818
td-agent: "treasuredata"
1919

2020
centos-aarch64:
21-
ceph: "centos-ceph-quincy"
21+
ceph: "centos-ceph-reef"
2222
crb: "crb"
2323
epel: "epel"
2424
erlang: "copr-hrw-erlang-for-rabbitmq"
@@ -136,7 +136,7 @@ debian-aarch64:
136136
gpg_key: "treasuredata.asc"
137137

138138
rocky:
139-
ceph: "centos-ceph-quincy"
139+
ceph: "centos-ceph-reef"
140140
crb: "crb"
141141
epel: "epel"
142142
erlang: "rabbitmq_rabbitmq-erlang"
@@ -154,7 +154,7 @@ rocky:
154154
td-agent: "treasuredata"
155155

156156
rocky-aarch64:
157-
ceph: "centos-ceph-quincy"
157+
ceph: "centos-ceph-reef"
158158
crb: "crb"
159159
epel: "epel"
160160
erlang: "copr-hrw-erlang-for-rabbitmq"

kolla/tests/test_methods.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_enable_repos_centos_multiple(self):
5555
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
5656
'enable')
5757
expectCmd = 'RUN dnf config-manager --enable grafana '
58-
expectCmd += '--enable centos-ceph-quincy || true'
58+
expectCmd += '--enable centos-ceph-reef || true'
5959
self.assertEqual(expectCmd, result)
6060

6161
def test_enable_repos_debian(self):
@@ -167,7 +167,7 @@ def test_disable_repos_centos_multiple(self):
167167
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
168168
'disable')
169169
expectCmd = 'RUN dnf config-manager --disable grafana '
170-
expectCmd += '--disable centos-ceph-quincy || true'
170+
expectCmd += '--disable centos-ceph-reef || true'
171171
self.assertEqual(expectCmd, result)
172172

173173
# NOTE(hrw): there is no disabling of repos for Debian/Ubuntu

0 commit comments

Comments
 (0)