Merge "Moved the server class out of the status class"

manifests/site.pp

@@ -538,8 +538,12 @@ node 'static.openstack.org' {
 # A machine to serve various project status updates.
 # Node-OS: precise
 node 'status.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::status':
-    sysadmins                     => hiera('sysadmins', []),
     gerrit_host                   => 'review.openstack.org',
     gerrit_ssh_host_key           => hiera('gerrit_ssh_rsa_pubkey_contents', 'XXX'),
     reviewday_ssh_public_key      => hiera('reviewday_rsa_pubkey_contents', 'XXX'),

modules/openstack_project/manifests/status.pp

@@ -1,7 +1,6 @@
 # == Class: openstack_project::status
 #
 class openstack_project::status (
-  $sysadmins = [],
   $gerrit_host,
   $gerrit_ssh_host_key,
   $reviewday_ssh_public_key = '',
@@ -19,11 +18,6 @@ class openstack_project::status (
   $jenkins_gitemail = 'jenkins@openstack.org',
 ) {
 
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins,
-  }
-
   include openstack_project
   class { 'jenkins::jenkinsuser':
     ssh_key => $openstack_project::jenkins_ssh_key,