diff --git a/manifests/site.pp b/manifests/site.pp index 300a4154d7..003e5a6cc1 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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', []), } } diff --git a/modules/openstack_project/files/mirror/rdo-mirror-update.sh b/modules/openstack_project/files/mirror/rdo-mirror-update.sh deleted file mode 100755 index c975e13b76..0000000000 --- a/modules/openstack_project/files/mirror/rdo-mirror-update.sh +++ /dev/null @@ -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." diff --git a/modules/openstack_project/manifests/mirror.pp b/modules/openstack_project/manifests/mirror.pp index 65c0db6368..72c1f9cc8d 100644 --- a/modules/openstack_project/manifests/mirror.pp +++ b/modules/openstack_project/manifests/mirror.pp @@ -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 diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index fc315932de..d5df9a8db6 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -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 ###