diff --git a/manifests/site.pp b/manifests/site.pp
index 88c26352f7..bd5aa7825a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -838,8 +838,16 @@ node 'zuul-dev.openstack.org' {
 
 # Node-OS: trusty
 node 'pbx.openstack.org' {
+  class { 'openstack_project::server':
+    sysadmins                 => hiera('sysadmins', []),
+    # SIP signaling is either TCP or UDP port 5060.
+    # RTP media (audio/video) uses a range of UDP ports.
+    iptables_public_tcp_ports => [5060],
+    iptables_public_udp_ports => [5060],
+    iptables_rules4           => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
+    iptables_rules6           => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
+  }
   class { 'openstack_project::pbx':
-    sysadmins     => hiera('sysadmins', []),
     sip_providers => [
       {
         provider => 'voipms',
diff --git a/modules/openstack_project/manifests/pbx.pp b/modules/openstack_project/manifests/pbx.pp
index 37692a1be1..820c1c3a8b 100644
--- a/modules/openstack_project/manifests/pbx.pp
+++ b/modules/openstack_project/manifests/pbx.pp
@@ -16,19 +16,8 @@
 #
 # == Class: openstack_project::pbx
 class openstack_project::pbx (
-  $sysadmins = [],
   $sip_providers = [],
 ) {
-  class { 'openstack_project::server':
-    sysadmins                 => $sysadmins,
-    # SIP signaling is either TCP or UDP port 5060.
-    # RTP media (audio/video) uses a range of UDP ports.
-    iptables_public_tcp_ports => [5060],
-    iptables_public_udp_ports => [5060],
-    iptables_rules4           => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
-    iptables_rules6           => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
-  }
-
   realize (
     User::Virtual::Localuser['rbryant'],
     User::Virtual::Localuser['pabelanger'],