From 6d9c4eee3aa1904dc5cd0d91230628e2e00b3024 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Wed, 11 Nov 2015 09:27:23 -0800
Subject: [PATCH] Rename sjc1 mirror to regionone

Current pypi mirror selection uses the actual cloud region from
nodepool, so the attempt to hide the default region name used by
bluebox does not work here.  In the future, we will alter the
format of pypi mirrors to something like
mirror.<region>.<cloud>.openstack.org, but that's a bigger job.
Today, just go with regionone so we can start using bluebox.

Change-Id: I575d3982a2c335054511492b1e664cfd17ab392a
---
 doc/source/bandersnatch.rst                     | 2 +-
 modules/openstack_project/manifests/cacti.pp    | 2 +-
 modules/openstack_project/manifests/server.pp   | 2 +-
 modules/openstack_project/manifests/template.pp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/bandersnatch.rst b/doc/source/bandersnatch.rst
index 30cb0ea3c0..6cc7b0b302 100644
--- a/doc/source/bandersnatch.rst
+++ b/doc/source/bandersnatch.rst
@@ -17,7 +17,7 @@ At a Glance
   * http://pypi.dfw.openstack.org
   * http://pypi.ord.openstack.org
   * http://pypi.region-b.geo-1.openstack.org
-  * http://pypi.sjc1.openstack.org
+  * http://pypi.regionone.openstack.org
 :Puppet:
   * :file:`modules/openstack_project/manifests/static.pp`
 :Projects:
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index c0997c0c55..c0069e54db 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -148,7 +148,7 @@ class openstack_project::cacti (
     'pypi.openstack.org',
     'pypi.ord.openstack.org',
     'pypi.region-b.geo-1.openstack.org',
-    'pypi.sjc1.openstack.org',
+    'pypi.regionone.openstack.org',
     'release.slave.openstack.org',
     'review-dev.openstack.org',
     'review.openstack.org',
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 7903875fc7..627e2b03c2 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -20,7 +20,7 @@ class openstack_project::server (
       'pypi.iad.openstack.org',
       'pypi.ord.openstack.org',
       'pypi.region-b.geo-1.openstack.org',
-      'pypi.sjc1.openstack.org',
+      'pypi.regionone.openstack.org',
   ],
 ) {
   class { 'openstack_project::template':
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index b23c92dac1..d52a534827 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -25,7 +25,7 @@ class openstack_project::template (
       'pypi.iad.openstack.org',
       'pypi.ord.openstack.org',
       'pypi.region-b.geo-1.openstack.org',
-      'pypi.sjc1.openstack.org',
+      'pypi.regionone.openstack.org',
   ],
 ) {