diff --git a/playbooks/roles/mirror/tasks/main.yaml b/playbooks/roles/mirror/tasks/main.yaml index 15b957efd0..f548a05f08 100644 --- a/playbooks/roles/mirror/tasks/main.yaml +++ b/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 diff --git a/playbooks/roles/reprepro/files/debian-ceph-quincy/config/distributions b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/distributions index 055ae965d5..418d5dd6a6 100755 --- a/playbooks/roles/reprepro/files/debian-ceph-quincy/config/distributions +++ b/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 diff --git a/playbooks/roles/reprepro/files/debian-ceph-reef/config/distributions b/playbooks/roles/reprepro/files/debian-ceph-reef/config/distributions new file mode 100755 index 0000000000..c5db98e740 --- /dev/null +++ b/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 diff --git a/playbooks/roles/reprepro/files/debian-ceph-reef/config/options b/playbooks/roles/reprepro/files/debian-ceph-reef/config/options new file mode 100755 index 0000000000..2ca7e8f711 --- /dev/null +++ b/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 diff --git a/playbooks/roles/reprepro/files/debian-ceph-reef/config/updates b/playbooks/roles/reprepro/files/debian-ceph-reef/config/updates new file mode 100755 index 0000000000..ab9aa88628 --- /dev/null +++ b/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 diff --git a/playbooks/roles/reprepro/tasks/debian-ceph.yaml b/playbooks/roles/reprepro/tasks/debian-ceph.yaml index ba408da652..b0c0267b62 100644 --- a/playbooks/roles/reprepro/tasks/debian-ceph.yaml +++ b/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' diff --git a/testinfra/test_mirror-update.py b/testinfra/test_mirror-update.py index cdbb592fb0..a7d5186cb1 100644 --- a/testinfra/test_mirror-update.py +++ b/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',