diff --git a/playbooks/roles/mirror/tasks/main.yaml b/playbooks/roles/mirror/tasks/main.yaml index 87ba8b1c03..561eddd2a9 100644 --- a/playbooks/roles/mirror/tasks/main.yaml +++ b/playbooks/roles/mirror/tasks/main.yaml @@ -82,6 +82,7 @@ - centos-stream - ceph-deb-nautilus - ceph-deb-octopus + - ceph-deb-quincy - 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 new file mode 100755 index 0000000000..055ae965d5 --- /dev/null +++ b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/distributions @@ -0,0 +1,17 @@ +Origin: Ceph Quincy +Codename: bullseye +Description: OpenStack Debian Ceph Quincy Bullseye mirror +Architectures: amd64 +Components: main +Contents: .gz +Update: debian-ceph-quincy +Log: /var/log/reprepro/debian-ceph-quincy-bullseye.log + +Origin: Ceph Quincy +Codename: focal +Description: OpenStack Debian Ceph Quincy Focal mirror +Architectures: amd64 +Components: main +Contents: .gz +Update: debian-ceph-quincy +Log: /var/log/reprepro/debian-ceph-quincy-focal.log diff --git a/playbooks/roles/reprepro/files/debian-ceph-quincy/config/options b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/options new file mode 100755 index 0000000000..50a4c393c5 --- /dev/null +++ b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/options @@ -0,0 +1,6 @@ +basedir /afs/.openstack.org/mirror/ceph-deb-quincy +keepunreferencedfiles +noskipold +export changed +spacecheck none +verbose diff --git a/playbooks/roles/reprepro/files/debian-ceph-quincy/config/updates b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/updates new file mode 100755 index 0000000000..b573857857 --- /dev/null +++ b/playbooks/roles/reprepro/files/debian-ceph-quincy/config/updates @@ -0,0 +1,7 @@ +Name: debian-ceph-quincy +Method: http://download.ceph.com/debian-quincy/ +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 7da0dc871b..ba408da652 100644 --- a/playbooks/roles/reprepro/tasks/debian-ceph.yaml +++ b/playbooks/roles/reprepro/tasks/debian-ceph.yaml @@ -27,3 +27,15 @@ _string_name: 'Debian Ceph Nautilus' _dir: 'debian-ceph-nautilus' _volume: 'mirror.deb-nautilus' + +- name: Copy Debian Ceph Quincy + include_tasks: utils/copy-config.yaml + vars: + _dir: 'debian-ceph-quincy' + +- name: Install Debian Ceph Quincy cron job + include_tasks: utils/cron.yaml + vars: + _string_name: 'Debian Ceph Quincy' + _dir: 'debian-ceph-quincy' + _volume: 'mirror.deb-quincy' diff --git a/testinfra/test_mirror-update.py b/testinfra/test_mirror-update.py index b5696dce4d..7c17acc38f 100644 --- a/testinfra/test_mirror-update.py +++ b/testinfra/test_mirror-update.py @@ -103,6 +103,7 @@ def test_reprepro_configs(host): 'debian-security', 'debian-ceph-octopus', 'debian-ceph-nautilus', + 'debian-ceph-quincy', 'debian-docker-xenial', 'debian-docker-bionic', 'debian-docker-focal',