Merge "Ubuntu 22.04: Add ceph quincy and reef to mirror"

playbooks/roles/mirror/tasks/main.yaml

@@ -88,6 +88,7 @@
     - ceph-deb-nautilus
     - ceph-deb-octopus
     - ceph-deb-quincy
+    - ceph-deb-reef
     - deb-docker
     - debian
     - debian-security

playbooks/roles/reprepro/files/debian-ceph-quincy/config/distributions

@@ -15,3 +15,12 @@ Components: main
 Contents: .gz
 Update: debian-ceph-quincy
 Log: /var/log/reprepro/debian-ceph-quincy-focal.log
+
+Origin: Ceph Quincy
+Codename: jammy
+Description: OpenStack Debian Ceph Quincy Jammy mirror
+Architectures: amd64
+Components: main
+Contents: .gz
+Update: debian-ceph-quincy
+Log: /var/log/reprepro/debian-ceph-quincy-jammy.log

playbooks/roles/reprepro/files/debian-ceph-reef/config/distributions

@@ -0,0 +1,8 @@
+Origin: Ceph Reef
+Codename: jammy
+Description: OpenStack Debian Ceph Reef Jammy mirror
+Architectures: amd64
+Components: main
+Contents: .gz
+Update: debian-ceph-reef
+Log: /var/log/reprepro/debian-ceph-reef-jammy.log

playbooks/roles/reprepro/files/debian-ceph-reef/config/options

@@ -0,0 +1,6 @@
+basedir /afs/.openstack.org/mirror/ceph-deb-reef
+keepunreferencedfiles
+noskipold
+export changed
+spacecheck none
+verbose

playbooks/roles/reprepro/files/debian-ceph-reef/config/updates

@@ -0,0 +1,7 @@
+Name: debian-ceph-reef
+Method: http://download.ceph.com/debian-reef/
+Components: main
+UDebComponents: main
+Architectures: amd64
+GetInRelease: no
+VerifyRelease: 460f3994

playbooks/roles/reprepro/tasks/debian-ceph.yaml

@@ -39,3 +39,15 @@
     _string_name: 'Debian Ceph Quincy'
     _dir: 'debian-ceph-quincy'
     _volume: 'mirror.deb-quincy'
+
+- name: Copy Debian Ceph Reef
+  include_tasks: utils/copy-config.yaml
+  vars:
+    _dir: 'debian-ceph-reef'
+
+- name: Install Debian Ceph Reef cron job
+  include_tasks: utils/cron.yaml
+  vars:
+    _string_name: 'Debian Ceph Reef'
+    _dir: 'debian-ceph-reef'
+    _volume: 'mirror.deb-reef'

testinfra/test_mirror-update.py

@@ -112,6 +112,7 @@ def test_reprepro_configs(host):
             'debian-ceph-octopus',
             'debian-ceph-nautilus',
             'debian-ceph-quincy',
+            'debian-ceph-reef',
             'debian-docker-xenial',
             'debian-docker-bionic',
             'debian-docker-focal',