opendev/system-config
Code Issues Proposed changes

Revert "Start using read/write AFS volume for PyPI mirror"

Browse Source 
This reverts commit 4e5a0dc458.

The read only volumes are happy again.

Change-Id: I78dca90b103153cc8a7dd21b6df99bb3875d41a7
This commit is contained in:
James E. Blair 2016-05-10 15:52:05 -07:00
parent 2b0fed20ea
commit 01838103b5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -583,7 +583,6 @@ node /^mirror\..*\.openstack\.org$/ {
class { 'openstack_project::mirror':
vhost_name => $::fqdn,
pypi_root => '/afs/.openstack.org/mirror/pypi',
require => Class['Openstack_project::Server'],
}
}

5
modules/openstack_project/files/bandersnatch-mirror-update.sh
View File

@ -19,8 +19,7 @@ set -e
echo "Obtaining bandersnatch tokens and running bandersnatch."
k5start -t -f /etc/bandersnatch.keytab service/bandersnatch -- timeout -k 2m 30m run-bandersnatch
# TODO(mordred): Re-enable this once vos release is running again
#echo "Bandersnatch completed successfully, running vos release."
#k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.pypi
echo "Bandersnatch completed successfully, running vos release."
k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.pypi
echo "Done."

2
modules/openstack_project/manifests/mirror.pp
View File

@ -1,11 +1,11 @@
# == Class: openstack_project::mirror
#
class openstack_project::mirror (
$pypi_root = "${mirror_root}/pypi",
$vhost_name = $::fqdn,
) {
$mirror_root = '/afs/openstack.org/mirror'
$pypi_root = "${mirror_root}/pypi"
$wheel_root = "${mirror_root}/wheel"
$npm_root = "${mirror_root}/npm"
$ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer"