opendev/system-config
Code Issues Proposed changes

Fixes needed for centos-mirror-update

Browse Source 
We needed to update our rsync flags because we are seeing issue with
chown / chgrp. Additionally, hard-linking is problematic.

Add missing k5start for mkdir.

Update crontab with missing mirror name.

Change-Id: I9addeae6a6ccf86684d3d5ebd42d4f8d96a9b916
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-05-10 16:39:31 -04:00
parent c3fc2462a4
commit 2b0fed20ea
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/files/mirror/centos-mirror-update.sh
View File

@ -17,16 +17,15 @@ MIRROR_VOLUME=$1
BASE="/afs/.openstack.org/mirror/centos" BASE="/afs/.openstack.org/mirror/centos"
MIRROR="rsync://mirror.sfo12.us.leaseweb.net" MIRROR="rsync://mirror.sfo12.us.leaseweb.net"
UNREF_FILE=/var/run/${MIRROR_VOLUME}.unreferenced-files
K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- timeout -k 2m 30m" K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- timeout -k 2m 30m"
REPO=7 REPO=7
if ! [ -f $BASE/$REPO ]; then if ! [ -f $BASE/$REPO ]; then
mkdir -p $BASE/$REPO $K5START mkdir -p $BASE/$REPO
fi fi
echo "Running rsync..." echo "Running rsync..."
$K5START rsync -avzH \ $K5START rsync -rlptDvz \
--delete \ --delete \
--delete-excluded \ --delete-excluded \
--exclude="atomic" \ --exclude="atomic" \

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

@ -215,7 +215,7 @@ class openstack_project::mirror_update (
user => $user, user => $user,
minute => '0', minute => '0',
hour => '*/2', hour => '*/2',
command => 'flock -n /var/run/centos-mirror.lock centos-mirror-update >>/var/log/centos-mirror.log 2>&1', command => 'flock -n /var/run/centos-mirror.lock centos-mirror-update mirror.centos >>/var/log/centos-mirror.log 2>&1',
environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
require => [ require => [
File['/usr/local/bin/centos-mirror-update'], File['/usr/local/bin/centos-mirror-update'],