Remove RDO AFS mirror
Sadly, RDO changes too much for us to mirror. However, we have setup a reverse proxy cache, so jobs are now using it. Once landed, I'll remove the volume from AFS. Change-Id: I249ba3719096aa24fab00fe6c660409a78168f23 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
2a63928351
commit
2b54564fab
@ -611,7 +611,6 @@ node 'mirror-update.openstack.org' {
|
||||
npm_keytab => hiera('npm_keytab'),
|
||||
centos_keytab => hiera('centos_keytab'),
|
||||
epel_keytab => hiera('epel_keytab'),
|
||||
rdo_keytab => hiera('rdo_keytab'),
|
||||
sysadmins => hiera('sysadmins', []),
|
||||
}
|
||||
}
|
||||
|
@ -1,40 +0,0 @@
|
||||
#!/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."
|
@ -89,13 +89,7 @@ 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}"],
|
||||
]
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
# Create the symlink to epel
|
||||
|
@ -11,7 +11,6 @@ class openstack_project::mirror_update (
|
||||
$epel_keytab = '',
|
||||
$fedora_keytab = '',
|
||||
$opensuse_keytab = '',
|
||||
$rdo_keytab = '',
|
||||
) {
|
||||
include ::gnupg
|
||||
include ::openstack_project::reprepro_mirror
|
||||
@ -289,31 +288,15 @@ class openstack_project::mirror_update (
|
||||
|
||||
### RDO mirror ###
|
||||
file { '/etc/rdo.keytab':
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0400',
|
||||
content => $rdo_keytab,
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
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',
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
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'],
|
||||
]
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
### EPEL mirror ###
|
||||
|
Loading…
Reference in New Issue
Block a user