From 2b0fed20eaa0f245190e1b6769ff573b48dabdc9 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 10 May 2016 16:39:31 -0400 Subject: [PATCH] Fixes needed for centos-mirror-update 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 --- .../openstack_project/files/mirror/centos-mirror-update.sh | 5 ++--- modules/openstack_project/manifests/mirror_update.pp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/mirror/centos-mirror-update.sh b/modules/openstack_project/files/mirror/centos-mirror-update.sh index 77828d3f5f..aa2f7c3c79 100755 --- a/modules/openstack_project/files/mirror/centos-mirror-update.sh +++ b/modules/openstack_project/files/mirror/centos-mirror-update.sh @@ -17,16 +17,15 @@ MIRROR_VOLUME=$1 BASE="/afs/.openstack.org/mirror/centos" 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" REPO=7 if ! [ -f $BASE/$REPO ]; then - mkdir -p $BASE/$REPO + $K5START mkdir -p $BASE/$REPO fi echo "Running rsync..." -$K5START rsync -avzH \ +$K5START rsync -rlptDvz \ --delete \ --delete-excluded \ --exclude="atomic" \ diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 3dc1aa3bba..c88093b121 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -215,7 +215,7 @@ class openstack_project::mirror_update ( user => $user, minute => '0', 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', require => [ File['/usr/local/bin/centos-mirror-update'],