From 3878c06e1b95c72d35916f2728788f71b37bdc02 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 15 Mar 2016 14:57:51 -0700 Subject: [PATCH] Apt mirror for ceph hammer release Mirror the trusty packages for the ceph hammer release to aid in process of making ceph testing more robust. Use reprepro which is already in use to mirror the main ubuntu trusty repos. Change-Id: Ifd09272c7b1e07de9135be5a96be06153a3f611e --- .../files/reprepro/ceph-mirror-gpg-key.asc | 29 +++++++++++++++++ .../files/reprepro/debian-ceph-hammer-updates | 7 +++++ .../manifests/mirror_update.pp | 31 +++++++++++++++++++ .../distributions.debian-ceph-hammer.erb | 12 +++++++ 4 files changed, 79 insertions(+) create mode 100644 modules/openstack_project/files/reprepro/ceph-mirror-gpg-key.asc create mode 100644 modules/openstack_project/files/reprepro/debian-ceph-hammer-updates create mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb diff --git a/modules/openstack_project/files/reprepro/ceph-mirror-gpg-key.asc b/modules/openstack_project/files/reprepro/ceph-mirror-gpg-key.asc new file mode 100644 index 0000000000..d2961c52e7 --- /dev/null +++ b/modules/openstack_project/files/reprepro/ceph-mirror-gpg-key.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFX4hgkBEADLqn6O+UFp+ZuwccNldwvh5PzEwKUPlXKPLjQfXlQRig1flpCH +E0HJ5wgGlCtYd3Ol9f9+qU24kDNzfbs5bud58BeE7zFaZ4s0JMOMuVm7p8JhsvkU +C/Lo/7NFh25e4kgJpjvnwua7c2YrA44ggRb1QT19ueOZLK5wCQ1mR+0GdrcHRCLr +7Sdw1d7aLxMT+5nvqfzsmbDullsWOD6RnMdcqhOxZZvpay8OeuK+yb8FVQ4sOIzB +FiNi5cNOFFHg+8dZQoDrK3BpwNxYdGHsYIwU9u6DWWqXybBnB9jd2pve9PlzQUbO +eHEa4Z+jPqxY829f4ldaql7ig8e6BaInTfs2wPnHJ+606g2UH86QUmrVAjVzlLCm +nqoGymoAPGA4ObHu9X3kO8viMBId9FzooVqR8a9En7ZE0Dm9O7puzXR7A1f5sHoz +JdYHnr32I+B8iOixhDUtxIY4GA8biGATNaPd8XR2Ca1hPuZRVuIiGG9HDqUEtXhV +fY5qjTjaThIVKtYgEkWMT+Wet3DPPiWT3ftNOE907e6EWEBCHgsEuuZnAbku1GgD +LBH4/a/yo9bNvGZKRaTUM/1TXhM5XgVKjd07B4cChgKypAVHvef3HKfCG2U/DkyA +LjteHt/V807MtSlQyYaXUTGtDCrQPSlMK5TjmqUnDwy6Qdq8dtWN3DtBWQARAQAB +tCpDZXBoLmNvbSAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUBjZXBoLmNvbT6JAjgE +EwECACIFAlX4hgkCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEOhKwsBG +DzmUXdIQAI8YPcZMBWdv489q8CzxlfRIRZ3Gv/G/8CH+EOExcmkVZ89mVHngCdAP +DOYCl8twWXC1lwJuLDBtkUOHXNuR5+Jcl5zFOUyldq1Hv8u03vjnGT7lLJkJoqpG +l9QD8nBqRvBU7EM+CU7kP8+09b+088pULil+8x46PwgXkvOQwfVKSOr740Q4J4nm +/nUOyTNtToYntmt2fAVWDTIuyPpAqA6jcqSOC7Xoz9cYxkVWnYMLBUySXmSS0uxl +3p+wK0lMG0my/gb+alke5PAQjcE5dtXYzCn+8Lj0uSfCk8Gy0ZOK2oiUjaCGYN6D +u72qDRFBnR3jaoFqi03bGBIMnglGuAPyBZiI7LJgzuT9xumjKTJW3kN4YJxMNYu1 +FzmIyFZpyvZ7930vB2UpCOiIaRdZiX4Z6ZN2frD3a/vBxBNqiNh/BO+Dex+PDfI4 +TqwF8zlcjt4XZ2teQ8nNMR/D8oiYTUW8hwR4laEmDy7ASxe0p5aijmUApWq5UTsF ++s/QbwugccU0iR5orksM5u9MZH4J/mFGKzOltfGXNLYI6D5Mtwrnyi0BsF5eY0u6 +vkdivtdqrq2DXY+ftuqLOQ7b+t1RctbcMHGPptlxFuN9ufP5TiTWSpfqDwmHCLsT +k2vFiMwcHdLpQ1IH8ORVRgPPsiBnBOJ/kIiXG2SxPUTjjEGOVgeA +=/Tod +-----END PGP PUBLIC KEY BLOCK----- diff --git a/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates b/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates new file mode 100644 index 0000000000..b23219eafd --- /dev/null +++ b/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates @@ -0,0 +1,7 @@ +Name: debian-ceph-hammer +Method: http://download.ceph.com/debian-hammer/ +Components: main +UDebComponents: main +Architectures: amd64 +GetInRelease: no +VerifyRelease: ecf8427e diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index dce59b4bda..a1b0e55ac3 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -162,4 +162,35 @@ class openstack_project::mirror_update ( key_server => 'hkp://keyserver.ubuntu.com', key_type => 'public', } + + ::openstack_project::reprepro { 'debian-ceph-hammer-reprepro-mirror': + confdir => '/etc/reprepro/debian-ceph-hammer', + basedir => '/afs/.openstack.org/mirror/debian-ceph-hammer', + distributions => 'openstack_project/reprepro/distributions.debian-ceph-hammer.erb', + updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-hammer-updates', + releases => ['trusty'], + } + + cron { 'reprepro debian ceph hammer': + user => $user, + hour => '*/2', + minute => '0', + command => 'flock -n /var/run/reprepro/debian-ceph-hammer.lock reprepro-mirror-update /etc/reprepro/debian-ceph-hammer mirror.deb-hammer >>/var/log/reprepro/debian-ceph-hammer-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-hammer-reprepro-mirror'], + ] + } + + gnupg_key { 'Ceph Archive': + ensure => present, + # D41D8CD98F00B204E9800998ECF8427E + key_id => 'E9800998ECF8427E', + user => 'root', + key_type => 'public', + key_source => 'puppet:///modules/openstack_project/reprepro/ceph-mirror-gpg-key.asc', + } } diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb new file mode 100644 index 0000000000..7981b13c71 --- /dev/null +++ b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb @@ -0,0 +1,12 @@ +<% @releases.each do |release| -%> +Origin: Ceph Hammer +Codename: <%= release %> +Description: OpenStack Debian Ceph Hammer <%= release.capitalize %> mirror +Architectures: amd64 +Components: main +UDebComponents: main +Contents: .gz +Update: debian-ceph-hammer +Log: <%= @logdir %>/debian-ceph-hammer<%= release %>.log + +<% end -%>