opendev/system-config
Code Issues Proposed changes

Merge "Add Ceph Luminous Debian mirrors"

Browse Source
This commit is contained in:
Jenkins 2017-10-09 04:18:58 +00:00 committed by Gerrit Code Review
commit fe8e4f1696
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-luminous-updates Normal file
View File

@ -0,0 +1,7 @@
Name: debian-ceph-luminous
Method: http://download.ceph.com/debian-luminous/
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 (
$npm_root = "${mirror_root}/npm"
$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"
$gem_root = "${mirror_root}/gem"
$www_base = '/var/www'
@ -178,6 +179,17 @@ class openstack_project::mirror (
]
}
# Create the symlink to ceph-deb-luminous.
file { "${www_root}/ceph-deb-luminous":
ensure => link,
target => "${ceph_deb_luminous_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

@ -248,6 +248,28 @@ class openstack_project::mirror_update (
]
}
::openstack_project::reprepro { 'debian-ceph-luminous-reprepro-mirror':
confdir => '/etc/reprepro/debian-ceph-luminous',
basedir => '/afs/.openstack.org/mirror/ceph-deb-luminous',
distributions => 'openstack_project/reprepro/distributions.debian-ceph-luminous.erb',
updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-luminous-updates',
releases => ['xenial'],
}
cron { 'reprepro debian ceph luminous':
user => $user,
hour => '*/2',
minute => '0',
command => 'flock -n /var/run/reprepro/debian-ceph-luminous.lock reprepro-mirror-update /etc/reprepro/debian-ceph-luminous mirror.deb-luminous >>/var/log/reprepro/debian-ceph-luminous-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-luminous-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-luminous.erb Normal file
View File

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