opendev/system-config
Code Issues Proposed changes

Merge "Update paths for AFS mirror"

Browse Source
This commit is contained in:
Jenkins 2016-02-08 15:14:19 +00:00 committed by Gerrit Code Review
commit 918c185761
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/files/reprepro/reprepro-mirror-update.sh
View File

@ -17,21 +17,22 @@
set -e set -e
UNREF_FILE=/var/run/reprepro/unreferenced-files UNREF_FILE=/var/run/reprepro/unreferenced-files
REPREPRO='reprepro --confdir /etc/reprepro'
echo "Obtaining reprepro tokens and running reprepro update" echo "Obtaining reprepro tokens and running reprepro update"
k5start -t -f /etc/reprepro.keytab service/reprepro -- timeout -k 2m 30m reprepro update k5start -t -f /etc/reprepro.keytab service/reprepro -- timeout -k 2m 30m $REPREPRO update
if [ -f $UNREF_FILE ] ; then if [ -f $UNREF_FILE ] ; then
echo "Cleaning up files made unreferenced on the last run" echo "Cleaning up files made unreferenced on the last run"
k5start -t -f /etc/reprepro.keytab service/reprepro -- timeout -k 2m 30m reprepro deleteifunreferenced < $UNREF_FILE k5start -t -f /etc/reprepro.keytab service/reprepro -- timeout -k 2m 30m $REPREPRO deleteifunreferenced < $UNREF_FILE
fi fi
echo "Saving list of newly unreferenced files for next time" echo "Saving list of newly unreferenced files for next time"
reprepro dumpunreferenced > $UNREF_FILE $REPREPRO dumpunreferenced > $UNREF_FILE
echo "Checking state of mirror" echo "Checking state of mirror"
reprepro checkpool fast $REPREPRO checkpool fast
reprepro check $REPREPRO check
echo "reprepro completed successfully, running reprepro export." echo "reprepro completed successfully, running reprepro export."
k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.apt k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.apt

2
modules/openstack_project/manifests/reprepro.pp
View File

@ -1,7 +1,7 @@
# == Class: openstack_project::mirror_update # == Class: openstack_project::mirror_update
# #
class openstack_project::reprepro ( class openstack_project::reprepro (
$outdir = '/afs/.openstack.org/mirror/apt', $basedir = '/afs/.openstack.org/mirror/apt',
$logdir = '/var/log/reprepro', $logdir = '/var/log/reprepro',
$updates_file = 'puppet:///modules/openstack_project/reprepro/updates', $updates_file = 'puppet:///modules/openstack_project/reprepro/updates',
$options_template = 'openstack_project/reprepro/options.erb', $options_template = 'openstack_project/reprepro/options.erb',

2
modules/openstack_project/templates/reprepro/options.erb
View File

@ -1,4 +1,4 @@
outdir <%= @outdir %> basedir <%= @basedir %>
keepunreferencedfiles keepunreferencedfiles
noskipold noskipold
export changed export changed