From 5acef2c0046ea5e8dbe8ed201a08dbdad9faec11 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 22 Nov 2018 16:14:12 +1100
Subject: [PATCH] Remove pypi symlink

Remove the pypi symlink from the mirrors in preparation for volume
removal

Change-Id: I0f1265857e204616e5e342afe764ff3a0215c4fe
Needed-By: https://review.openstack.org/618326
---
 modules/openstack_project/manifests/mirror.pp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/manifests/mirror.pp b/modules/openstack_project/manifests/mirror.pp
index 787c55c7f1..96ead7deaf 100644
--- a/modules/openstack_project/manifests/mirror.pp
+++ b/modules/openstack_project/manifests/mirror.pp
@@ -15,7 +15,6 @@ class openstack_project::mirror (
   }
 
   $mirror_root = '/afs/openstack.org/mirror'
-  $pypi_root = "${mirror_root}/pypi"
   $wheel_root = "${mirror_root}/wheel"
   $ceph_deb_hammer_root = "${mirror_root}/ceph-deb-hammer"
   $ceph_deb_jewel_root = "${mirror_root}/ceph-deb-jewel"
@@ -44,14 +43,10 @@ class openstack_project::mirror (
   }
 
   # Create the symlink to pypi.
+  # NOTE(ianw) : retired 2018-11-22; see
+  # https://review.openstack.org/#/c/618326/
   file { "${www_root}/pypi":
-    ensure  => link,
-    target  => "${pypi_root}/web",
-    owner   => root,
-    group   => root,
-    require => [
-      File["${www_root}"],
-    ]
+    ensure  => absent,
   }
 
   # Create the symlink to wheel.