diff --git a/manifests/site.pp b/manifests/site.pp
index 0f93705e08..f69f9c65ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -233,9 +233,12 @@ node 'puppetmaster.openstack.org' {
 
 # Node-OS: precise
 node 'puppetdb.openstack.org' {
-  class { 'openstack_project::puppetdb':
-    sysadmins => hiera('sysadmins', []),
+  $open_ports = [8081, 80]
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => $open_ports,
+    sysadmins                 => hiera('sysadmins', []),
   }
+  include openstack_project::puppetdb
 }
 
 # Node-OS: precise
diff --git a/modules/openstack_project/manifests/puppetdb.pp b/modules/openstack_project/manifests/puppetdb.pp
index 94f51abcab..60dde0c462 100644
--- a/modules/openstack_project/manifests/puppetdb.pp
+++ b/modules/openstack_project/manifests/puppetdb.pp
@@ -1,7 +1,6 @@
 # == Class: openstack_project::puppetdb
 #
 class openstack_project::puppetdb (
-  $sysadmins = [],
   $puppetboard = true,
 ) {
 
@@ -20,18 +19,7 @@ class openstack_project::puppetdb (
     system => true,
   }
 
-  if $puppetboard {
-    $open_ports = [8081, 80]
-  } else {
-    $open_ports = [8081]
-  }
-
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => $open_ports,
-    sysadmins                 => $sysadmins,
-  }
-
-  class { '::puppetdb::database::postgresql':
+  class { 'puppetdb::database::postgresql':
     require         => [User['postgres'],
       Class['openstack_project::template'],],
   }