diff --git a/modules/openstack_project/files/reprepro/debian-ceph-octopus-updates b/modules/openstack_project/files/reprepro/debian-ceph-octopus-updates new file mode 100644 index 0000000000..243c393129 --- /dev/null +++ b/modules/openstack_project/files/reprepro/debian-ceph-octopus-updates @@ -0,0 +1,7 @@ +Name: debian-ceph-octopus +Method: http://download.ceph.com/debian-octopus/ +Components: main +UDebComponents: main +Architectures: amd64 +GetInRelease: no +VerifyRelease: 460f3994 diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 3d737ee3a3..47169c949e 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -319,6 +319,28 @@ class openstack_project::mirror_update ( ] } + ::openstack_project::reprepro { 'debian-ceph-octopus-reprepro-mirror': + confdir => '/etc/reprepro/debian-ceph-octopus', + basedir => '/afs/.openstack.org/mirror/ceph-deb-octopus', + distributions => 'openstack_project/reprepro/distributions.debian-ceph-octopus.erb', + updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-octopus-updates', + releases => ['buster'], + } + + cron { 'reprepro debian ceph octopus': + user => 'root', + hour => '*/2', + minute => fqdn_rand(45, 'debian-ceph-octopus'), + command => 'flock -n /var/run/reprepro/debian-ceph-octopus.lock reprepro-mirror-update /etc/reprepro/debian-ceph-octopus mirror.deb-octopus >>/var/log/reprepro/debian-ceph-octopus-mirror.log 2>&1', + environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', + require => [ + File['/usr/local/bin/reprepro-mirror-update'], + File['/etc/afsadmin.keytab'], + File['/etc/reprepro.keytab'], + ::Openstack_project::Reprepro['debian-ceph-octopus-reprepro-mirror'], + ] + } + gnupg_key { 'Ceph Archive': ensure => present, # 08B7 3419 AC32 B4E9 66C1 A330 E84A C2C0 460F 3994 diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-octopus.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-octopus.erb new file mode 100644 index 0000000000..f442294bf6 --- /dev/null +++ b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-octopus.erb @@ -0,0 +1,11 @@ +<% @releases.each do |release| -%> +Origin: Ceph Octopus +Codename: <%= release %> +Description: OpenStack Debian Ceph Octopus <%= release.capitalize %> mirror +Architectures: amd64 +Components: main +Contents: .gz +Update: debian-ceph-octopus +Log: <%= @logdir %>/debian-ceph-octopus-<%= release %>.log + +<% end -%> diff --git a/playbooks/roles/mirror/tasks/main.yaml b/playbooks/roles/mirror/tasks/main.yaml index f700c29dc0..71e2851d42 100644 --- a/playbooks/roles/mirror/tasks/main.yaml +++ b/playbooks/roles/mirror/tasks/main.yaml @@ -84,6 +84,7 @@ - ceph-deb-luminous - ceph-deb-mimic - ceph-deb-nautilus + - ceph-deb-octopus - deb-docker - debian - debian-security