diff --git a/playbooks/roles/mirror-update/files/centos-mirror-update b/playbooks/roles/mirror-update/files/centos-mirror-update index fba94a2707..96b61dd547 100755 --- a/playbooks/roles/mirror-update/files/centos-mirror-update +++ b/playbooks/roles/mirror-update/files/centos-mirror-update @@ -39,7 +39,7 @@ K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- $TIMEOUT" if [[ ${DRY_RUN:-0} -ne 1 ]]; then # Cleanup old repos - for REPO in 8 altarch ; do + for REPO in 7 ; do if [ -d $BASE/$REPO/ ]; then $K5START rm -rf $BASE/$REPO/ fi @@ -69,42 +69,6 @@ $K5START ${RSYNC} \ --exclude=".*" \ $MIRROR $BASE/8-stream -# -# -- Centos 7 -- -# - -MIRROR="rsync://msync.centos.org/centos-full/centos/" -REPOS="7" - -for REPO in $REPOS; do - if ! [ -f $BASE/$REPO ]; then - $K5START mkdir -p $BASE/$REPO - fi - - MIRROR_PATH=$MIRROR/$REPO/ - EXTRA_OPTS="--links" # -l - - date --iso-8601=ns - echo "Running rsync..." - $K5START ${RSYNC} \ - --delete \ - --delete-excluded \ - --exclude="atomic" \ - --exclude="centosplus" \ - --exclude="experimental" \ - --exclude="fasttrack" \ - --exclude="isos" \ - --exclude="images/" \ - --exclude="isolinux/" \ - --exclude="paas" \ - --exclude="*/drpms" \ - --exclude="*.i686.rpm" \ - $EXTRA_OPTS \ - $MIRROR_PATH $BASE/$REPO/ - - # TODO(pabelanger): Validate rsync process -done - if [[ ${DRY_RUN:-0} -ne 1 ]]; then date --iso-8601=ns | $K5START tee $BASE/timestamp.txt echo "rsync completed successfully, running vos release." diff --git a/playbooks/roles/mirror-update/files/opensuse-mirror-update b/playbooks/roles/mirror-update/files/opensuse-mirror-update index e2d4bb1bc2..c38d6eee21 100755 --- a/playbooks/roles/mirror-update/files/opensuse-mirror-update +++ b/playbooks/roles/mirror-update/files/opensuse-mirror-update @@ -29,10 +29,7 @@ fi BASE="/afs/.openstack.org/mirror/opensuse" MIRROR="rsync://mirror.clarkson.edu/opensuse/opensuse" OBS_MIRROR="rsync://provo-mirror.opensuse.org/opensuse/repositories" -OBS_REPOS=( - # NOTE(yoctozepto): kolla uses the following for hacluster - 'network:/ha-clustering:/Stable/CentOS_CentOS-7' -) +OBS_REPOS=() K5START="k5start -t -f /etc/opensuse.keytab service/opensuse-mirror -- $TIMEOUT" # NOTE(hwoarang): Ensure old distros are not mirrored aymore @@ -41,6 +38,7 @@ for REPO in distribution/leap/15.1 update/leap/15.1 distribution/leap/15.2 \ repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.1 \ repositories/Cloud:/OpenStack:/Ussuri/openSUSE_Leap_15.2 \ repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.2 \ + network:/ha-clustering:/Stable/CentOS_CentOS-7 \ update/tumbleweed tumbleweed ; do if [ -d $BASE/$REPO ]; then $K5START rm -rf $BASE/$REPO