From 4e5a0dc4586d313b8692e8f9600ab7be640590da Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 4 May 2016 11:39:24 -0500
Subject: [PATCH] Start using read/write AFS volume for PyPI mirror

The vos release on AFS for PyPI is in a bad place emotionally right now.
So as not to stress it out too much more, stop vos releasing until we
can get it fixed. Also, point the AFS client mirrors to the read/write
path instead of the read only path so that the gate can get PyPI updates
again.

Change-Id: I5d9ac9cc56c16dacad22c1da157cad7f5480c301
---
 manifests/site.pp                                            | 1 +
 .../openstack_project/files/bandersnatch-mirror-update.sh    | 5 +++--
 modules/openstack_project/manifests/mirror.pp                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index c3e07fed84..117d5d8b1f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -582,6 +582,7 @@ node /^mirror\..*\.openstack\.org$/ {
 
   class { 'openstack_project::mirror':
     vhost_name => $::fqdn,
+    pypi_root  => '/afs/.openstack.org/mirror/pypi',
     require    => Class['Openstack_project::Server'],
   }
 }
diff --git a/modules/openstack_project/files/bandersnatch-mirror-update.sh b/modules/openstack_project/files/bandersnatch-mirror-update.sh
index 4c9568c8ec..d0c7778898 100644
--- a/modules/openstack_project/files/bandersnatch-mirror-update.sh
+++ b/modules/openstack_project/files/bandersnatch-mirror-update.sh
@@ -19,7 +19,8 @@ set -e
 echo "Obtaining bandersnatch tokens and running bandersnatch."
 k5start -t -f /etc/bandersnatch.keytab service/bandersnatch -- timeout -k 2m 30m run-bandersnatch
 
-echo "Bandersnatch completed successfully, running vos release."
-k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.pypi
+# 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 "Done."
diff --git a/modules/openstack_project/manifests/mirror.pp b/modules/openstack_project/manifests/mirror.pp
index dfec78b367..d941be9011 100644
--- a/modules/openstack_project/manifests/mirror.pp
+++ b/modules/openstack_project/manifests/mirror.pp
@@ -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"