Merge "Mirror rdo centos7 repo to AFS"

This commit is contained in:
Jenkins 2017-04-03 18:24:34 +00:00 committed by Gerrit Code Review
commit e25445ebb4
3 changed files with 81 additions and 0 deletions

View File

@ -0,0 +1,40 @@
#!/bin/bash -xe
# Copyright 2017 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
MIRROR_VOLUME=$1
BASE="/afs/.openstack.org/mirror/rdo"
MIRROR="rsync://trunk.rdoproject.org"
K5START="k5start -t -f /etc/rdo.keytab service/rdo-mirror -- timeout -k 2m 30m"
REPO=centos7
if ! [ -f $BASE/$REPO ]; then
$K5START mkdir -p $BASE/$REPO
fi
date --iso-8601=ns
echo "Running rsync..."
$K5START rsync -rlptDvz \
--delete \
$MIRROR/$REPO/ $BASE/$REPO/
# TODO(pabelanger): Validate rsync process
date --iso-8601=ns | $K5START tee $BASE/timestamp.txt
echo "rsync completed successfully, running vos release."
k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v $MIRROR_VOLUME
date --iso-8601=ns
echo "Done."

View File

@ -87,6 +87,17 @@ class openstack_project::mirror (
]
}
# Create the symlink to rdo
file { "${www_root}/rdo":
ensure => link,
target => "${mirror_root}/rdo",
owner => root,
group => root,
require => [
File["${www_root}"],
]
}
# Create the symlink to epel
file { "${www_root}/epel":
ensure => link,

View File

@ -11,6 +11,7 @@ class openstack_project::mirror_update (
$epel_keytab = '',
$fedora_keytab = '',
$opensuse_keytab = '',
$rdo_keytab = '',
) {
include ::gnupg
include ::openstack_project::reprepro_mirror
@ -286,6 +287,35 @@ class openstack_project::mirror_update (
]
}
### RDO mirror ###
file { '/etc/rdo.keytab':
owner => 'root',
group => 'root',
mode => '0400',
content => $rdo_keytab,
}
file { '/usr/local/bin/rdo-mirror-update':
ensure => present,
owner => 'root',
group => 'root',
mode => '0755',
source => 'puppet:///modules/openstack_project/mirror/rdo-mirror-update.sh',
}
cron { 'rdo mirror':
user => $user,
minute => '0',
hour => '*/2',
command => 'flock -n /var/run/rdo-mirror.lock rdo-mirror-update mirror.rdo >>/var/log/rdo-mirror.log 2>&1',
environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
require => [
File['/usr/local/bin/rdo-mirror-update'],
File['/etc/afsadmin.keytab'],
File['/etc/rdo.keytab'],
]
}
### EPEL mirror ###
file { '/etc/epel.keytab':
owner => 'root',