opendev/system-config
Code Issues Proposed changes

Merge "Mirror Ceph Mimic for Debian based"

Browse Source
This commit is contained in:
Zuul 2018-06-18 05:21:52 +00:00 committed by Gerrit Code Review
commit 7d16a16ca7
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-mimic-updates Normal file
View File

@ -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

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

@ -20,6 +20,7 @@ class openstack_project::mirror (
$ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer" $ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer"
$ceph_deb_jewel_root = "${mirror_root}/ceph-deb-jewel" $ceph_deb_jewel_root = "${mirror_root}/ceph-deb-jewel"
$ceph_deb_luminous_root = "${mirror_root}/ceph-deb-luminous" $ceph_deb_luminous_root = "${mirror_root}/ceph-deb-luminous"
$ceph_deb_mimic_root = "${mirror_root}/ceph-deb-mimic"
$gem_root = "${mirror_root}/gem" $gem_root = "${mirror_root}/gem"
$www_base = '/var/www' $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. # Create the symlink to Ubuntu Cloud Archive.
file { "${www_root}/ubuntu-cloud-archive": file { "${www_root}/ubuntu-cloud-archive":
ensure => link, ensure => link,

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

@ -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': gnupg_key { 'Ceph Archive':
ensure => present, ensure => present,
# 08B7 3419 AC32 B4E9 66C1 A330 E84A C2C0 460F 3994 # 08B7 3419 AC32 B4E9 66C1 A330 E84A C2C0 460F 3994

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

@ -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 -%>