From 046e793cd43216f2657d3344453abf07f401c455 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 3 Jun 2018 23:20:49 +0200 Subject: [PATCH] Mirror Ceph Mimic for Debian based Ceph Mimic is now release and the official mirror is available. This adds the Ceph Mimic mirror so we sync the version for Stretch, Xenial and Bionic. Change-Id: Id358d657b6d1daed3bc72447fa94aef198928e50 --- .../files/reprepro/debian-ceph-mimic-updates | 7 ++++++ modules/openstack_project/manifests/mirror.pp | 12 ++++++++++ .../manifests/mirror_update.pp | 22 +++++++++++++++++++ .../distributions.debian-ceph-mimic.erb | 11 ++++++++++ 4 files changed, 52 insertions(+) create mode 100644 modules/openstack_project/files/reprepro/debian-ceph-mimic-updates create mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb diff --git a/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates b/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates new file mode 100644 index 0000000000..ac1aaa84f2 --- /dev/null +++ b/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates @@ -0,0 +1,7 @@ +Name: debian-ceph-mimic +Method: http://download.ceph.com/debian-mimic/ +Components: main +UDebComponents: main +Architectures: amd64 +GetInRelease: no +VerifyRelease: 460f3994 diff --git a/modules/openstack_project/manifests/mirror.pp b/modules/openstack_project/manifests/mirror.pp index c33c461ad7..2e17db4628 100644 --- a/modules/openstack_project/manifests/mirror.pp +++ b/modules/openstack_project/manifests/mirror.pp @@ -20,6 +20,7 @@ class openstack_project::mirror ( $ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer" $ceph_deb_jewel_root = "${mirror_root}/ceph-deb-jewel" $ceph_deb_luminous_root = "${mirror_root}/ceph-deb-luminous" + $ceph_deb_mimic_root = "${mirror_root}/ceph-deb-mimic" $gem_root = "${mirror_root}/gem" $www_base = '/var/www' @@ -201,6 +202,17 @@ class openstack_project::mirror ( ] } + # Create the symlink to ceph-deb-mimic. + file { "${www_root}/ceph-deb-mimic": + ensure => link, + target => "${ceph_deb_mimic_root}", + owner => root, + group => root, + require => [ + File["${www_root}"], + ] + } + # Create the symlink to Ubuntu Cloud Archive. file { "${www_root}/ubuntu-cloud-archive": ensure => link, diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 2055963e56..d95675893a 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -285,6 +285,28 @@ class openstack_project::mirror_update ( ] } + ::openstack_project::reprepro { 'debian-ceph-mimic-reprepro-mirror': + confdir => '/etc/reprepro/debian-ceph-mimic', + basedir => '/afs/.openstack.org/mirror/ceph-deb-mimic', + distributions => 'openstack_project/reprepro/distributions.debian-ceph-mimic.erb', + updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-mimic-updates', + releases => ['stretch', 'xenial', 'bionic'], + } + + cron { 'reprepro debian ceph mimic': + user => $user, + hour => '*/2', + minute => fqdn_rand(45, 'debian-ceph-mimic'), + command => 'flock -n /var/run/reprepro/debian-ceph-mimic.lock reprepro-mirror-update /etc/reprepro/debian-ceph-mimic mirror.deb-mimic >>/var/log/reprepro/debian-ceph-mimic-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-mimic-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-mimic.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb new file mode 100644 index 0000000000..22e6680167 --- /dev/null +++ b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb @@ -0,0 +1,11 @@ +<% @releases.each do |release| -%> +Origin: Ceph Mimic +Codename: <%= release %> +Description: OpenStack Debian Ceph Mimic <%= release.capitalize %> mirror +Architectures: amd64 +Components: main +Contents: .gz +Update: debian-ceph-mimic +Log: <%= @logdir %>/debian-ceph-mimic-<%= release %>.log + +<% end -%>