diff --git a/manifests/site.pp b/manifests/site.pp
index a6d5bf4884..ff07dcc861 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -53,6 +53,11 @@ node default {
 # Node-OS: precise
 # Node-OS: trusty
 node 'review.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443, 29418],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::review':
     project_config_repo                 => 'https://git.openstack.org/openstack-infra/project-config',
     github_oauth_token                  => hiera('gerrit_github_token'),
@@ -83,7 +88,6 @@ node 'review.openstack.org' {
     lp_sync_secret                      => hiera('gerrit_lp_access_secret'),
     contactstore_appsec                 => hiera('gerrit_contactstore_appsec'),
     contactstore_pubkey                 => hiera('gerrit_contactstore_pubkey'),
-    sysadmins                           => hiera('sysadmins', []),
     swift_username                      => hiera('swift_store_user', 'username'),
     swift_password                      => hiera('swift_store_key'),
   }
@@ -91,6 +95,12 @@ node 'review.openstack.org' {
 
 # Node-OS: trusty
 node 'review-dev.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443, 29418],
+    sysadmins                 => hiera('sysadmins', []),
+    afs                       => true,
+  }
+
   class { 'openstack_project::review_dev':
     project_config_repo                 => 'https://git.openstack.org/openstack-infra/project-config',
     github_oauth_token                  => hiera('gerrit_dev_github_token'),
@@ -112,7 +122,6 @@ node 'review-dev.openstack.org' {
     lp_sync_consumer_key                => hiera('gerrit_dev_lp_consumer_key'),
     lp_sync_token                       => hiera('gerrit_dev_lp_access_token'),
     lp_sync_secret                      => hiera('gerrit_dev_lp_access_secret'),
-    sysadmins                           => hiera('sysadmins', []),
   }
 }
 
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index c0ec22246d..58a8f3f409 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -64,7 +64,6 @@ class openstack_project::gerrit (
   $cla_id = '2',
   $cla_name = 'ICLA',
   $testmode = false,
-  $sysadmins = [],
   $swift_username = '',
   $swift_password = '',
   $gitweb = true,
@@ -72,13 +71,7 @@ class openstack_project::gerrit (
   $web_repo_url = '',
   $web_repo_url_encode = false,
   $secondary_index = true,
-  $afs = false,
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80, 443, 29418],
-    sysadmins                 => $sysadmins,
-    afs                       => $afs,
-  }
 
   class { 'jeepyb::openstackwatch':
     projects       => [
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 80488936c7..47fcd18292 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -76,7 +76,6 @@ class openstack_project::review (
   $contactstore = true,
   $contactstore_appsec='',
   $contactstore_pubkey='',
-  $sysadmins = [],
   # For openstackwatch.
   $swift_username = '',
   $swift_password = '',
@@ -133,7 +132,6 @@ class openstack_project::review (
     mysql_password                      => $mysql_password,
     email_private_key                   => $email_private_key,
     token_private_key                   => $token_private_key,
-    sysadmins                           => $sysadmins,
     swift_username                      => $swift_username,
     swift_password                      => $swift_password,
     replication_force_update            => true,
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 10a919922b..fd5ad01e78 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -22,7 +22,6 @@ class openstack_project::review_dev (
   $lp_sync_consumer_key = '',
   $lp_sync_token = '',
   $lp_sync_secret = '',
-  $sysadmins = [],
   $swift_username = '',
   $swift_password = '',
   $project_config_repo = '',
@@ -71,7 +70,6 @@ class openstack_project::review_dev (
     mysql_host                          => $mysql_host,
     mysql_password                      => $mysql_password,
     email_private_key                   => $email_private_key,
-    sysadmins                           => $sysadmins,
     gitweb                              => false,
     cgit                                => true,
     web_repo_url                        => 'https://git.openstack.org/cgit/',
@@ -104,7 +102,6 @@ class openstack_project::review_dev (
       },
     ],
     require                         => $::project_config::config_dir,
-    afs                             => true,
   }
 
   gerrit::plugin { 'javamelody':