diff --git a/hiera/common.yaml b/hiera/common.yaml
index dc2f98de6a..5a8c655aad 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -281,6 +281,14 @@ cacti_hosts:
 - pypi.ord.openstack.org
 - pypi.region-b.geo-1.openstack.org
 - pypi.regionone.openstack.org
+- mirror.bhs1.ovh.openstack.org
+- mirror.dfw.rackspace.openstack.org
+- mirror.gra1.ovh.openstack.org
+- mirror.iad.rax.openstack.org
+- mirror.nyj01.internap.openstack.org
+- mirror.ord.rax.openstack.org
+- mirror.region-b.geo-1.hpcloud.openstack.org
+- mirror.regionone.bluebox-sjc1.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 c627689de9..290ad971f6 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -16,14 +16,22 @@ class openstack_project::server (
   $manage_exim               = true,
   $pypi_index_url            = 'https://pypi.python.org/simple',
   $pypi_trusted_hosts        = [
-      'pypi.bhs1.openstack.org',
-      'pypi.dfw.openstack.org',
-      'pypi.gra1.openstack.org',
-      'pypi.iad.openstack.org',
-      'pypi.nyj01.openstack.org',
-      'pypi.ord.openstack.org',
-      'pypi.region-b.geo-1.openstack.org',
-      'pypi.regionone.openstack.org',
+    'pypi.bhs1.openstack.org',
+    'pypi.dfw.openstack.org',
+    'pypi.gra1.openstack.org',
+    'pypi.iad.openstack.org',
+    'pypi.nyj01.openstack.org',
+    'pypi.ord.openstack.org',
+    'pypi.region-b.geo-1.openstack.org',
+    'pypi.regionone.openstack.org',
+    'mirror.bhs1.ovh.openstack.org',
+    'mirror.dfw.rackspace.openstack.org',
+    'mirror.gra1.ovh.openstack.org',
+    'mirror.iad.rax.openstack.org',
+    'mirror.nyj01.internap.openstack.org',
+    'mirror.ord.rax.openstack.org',
+    'mirror.region-b.geo-1.hpcloud.openstack.org',
+    'mirror.regionone.bluebox-sjc1.openstack.org',
   ],
 ) {
   class { 'openstack_project::template':
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index e3d319fbc0..a9a727779f 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -20,14 +20,22 @@ class openstack_project::template (
   $sysadmins                 = [],
   $pypi_index_url            = 'https://pypi.python.org/simple',
   $pypi_trusted_hosts        = [
-      'pypi.bhs1.openstack.org',
-      'pypi.dfw.openstack.org',
-      'pypi.gra1.openstack.org',
-      'pypi.iad.openstack.org',
-      'pypi.nyj01.openstack.org',
-      'pypi.ord.openstack.org',
-      'pypi.region-b.geo-1.openstack.org',
-      'pypi.regionone.openstack.org',
+    'pypi.bhs1.openstack.org',
+    'pypi.dfw.openstack.org',
+    'pypi.gra1.openstack.org',
+    'pypi.iad.openstack.org',
+    'pypi.nyj01.openstack.org',
+    'pypi.ord.openstack.org',
+    'pypi.region-b.geo-1.openstack.org',
+    'pypi.regionone.openstack.org',
+    'mirror.bhs1.ovh.openstack.org',
+    'mirror.dfw.rackspace.openstack.org',
+    'mirror.gra1.ovh.openstack.org',
+    'mirror.iad.rax.openstack.org',
+    'mirror.nyj01.internap.openstack.org',
+    'mirror.ord.rax.openstack.org',
+    'mirror.region-b.geo-1.hpcloud.openstack.org',
+    'mirror.regionone.bluebox-sjc1.openstack.org',
   ],
   $purge_apt_sources         = false,
 ) {