opendev
/
system-config
Code Issues Proposed changes

Add debian-ceph-jewel mirror to AFS 

As more teams will be switching to jewel from hammer, we also need to
provide a debian mirror for it.

Change-Id: I0f5097672c0afd092380d841c665c3fdfa25f280
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-05-07 18:37:27 -04:00
parent f87d71b227
commit c85859ca2d
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
4 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openstack_project/files/reprepro/debian-ceph-jewel-updates Normal file
View File

@ -0,0 +1,7 @@
Name: debian-ceph-jewel
Method: http://download.ceph.com/debian-jewel/
Components: main
UDebComponents: main
Architectures: amd64
GetInRelease: no
VerifyRelease: 460f3994

12
modules/openstack_project/manifests/mirror.pp
View File

@ -9,6 +9,7 @@ class openstack_project::mirror (
$wheel_root = "${mirror_root}/wheel"
$npm_root = "${mirror_root}/npm"
$ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer"
$ceph_deb_jewel_root = "${mirror_root}/ceph-deb-jewel"
$www_base = '/var/www'
$www_root = "${www_base}/mirror"
@ -117,6 +118,17 @@ class openstack_project::mirror (
]
}
# Create the symlink to ceph-deb-jewel.
file { "${www_root}/ceph-deb-jewel":
ensure => link,
target => "${ceph_deb_jewel_root}",
owner => root,
group => root,
require => [
File["${www_root}"],
]
}
# Create the symlink to Ubuntu Cloud Archive.
file { "${www_root}/ubuntu-cloud-archive":
ensure => link,

22
modules/openstack_project/manifests/mirror_update.pp
View File

@ -164,6 +164,28 @@ class openstack_project::mirror_update (
]
}
::openstack_project::reprepro { 'debian-ceph-jewel-reprepro-mirror':
confdir => '/etc/reprepro/debian-ceph-jewel',
basedir => '/afs/.openstack.org/mirror/ceph-deb-jewel',
distributions => 'openstack_project/reprepro/distributions.debian-ceph-jewel.erb',
updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-jewel-updates',
releases => ['trusty', 'xenial'],
}
cron { 'reprepro debian ceph jewel':
user => $user,
hour => '*/2',
minute => '0',
command => 'flock -n /var/run/reprepro/debian-ceph-jewel.lock reprepro-mirror-update /etc/reprepro/debian-ceph-jewel mirror.deb-jewel >>/var/log/reprepro/debian-ceph-jewel-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-jewel-reprepro-mirror'],
]
}
gnupg_key { 'Ceph Archive':
ensure => present,
# 08B7 3419 AC32 B4E9 66C1 A330 E84A C2C0 460F 3994

11
modules/openstack_project/templates/reprepro/distributions.debian-ceph-jewel.erb Normal file
View File

@ -0,0 +1,11 @@
<% @releases.each do |release| -%>
Origin: Ceph Jewel
Codename: <%= release %>
Description: OpenStack Debian Ceph Jewel <%= release.capitalize %> mirror
Architectures: amd64
Components: main
Contents: .gz
Update: debian-ceph-jewel
Log: <%= @logdir %>/debian-ceph-jewel-<%= release %>.log
<% end -%>