diff --git a/manifests/site.pp b/manifests/site.pp
index e2c9a257a0..a6df9bae71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -384,6 +384,14 @@ node /^git\d+\.openstack\.org$/ {
   }
 }
 
+# Machines in each region to run PyPI mirrors.
+# Node-OS: precise
+node /^pypi\..*\.openstack\.org$/ {
+  class { 'openstack_project::pypi':
+    sysadmins               => hiera('sysadmins', []),
+  }
+}
+
 # A machine to run ODSREG in preparation for summits.
 # Node-OS: precise
 node 'summit.openstack.org' {
diff --git a/modules/openstack_project/manifests/pypi.pp b/modules/openstack_project/manifests/pypi.pp
new file mode 100644
index 0000000000..1290f5cced
--- /dev/null
+++ b/modules/openstack_project/manifests/pypi.pp
@@ -0,0 +1,16 @@
+# == Class: openstack_project::pypi
+#
+class openstack_project::pypi (
+  $vhost_name = $::fqdn,
+  $sysadmins = [],
+) {
+
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80],
+    sysadmins                 => $sysadmins,
+  }
+
+  class { 'openstack_project::pypi_mirror':
+    vhost_name => $vhost_name,
+  }
+}