Merge "Moved the server class settings out of the eavesdrop class"

manifests/site.pp

@@ -288,10 +288,14 @@ node 'planet.openstack.org' {
 
 # Node-OS: precise
 node 'eavesdrop.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::eavesdrop':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
     nickpass                => hiera('openstack_meetbot_password', 'XXX'),
-    sysadmins               => hiera('sysadmins', []),
     statusbot_nick          => hiera('statusbot_nick', 'username'),
     statusbot_password      => hiera('statusbot_nick_password', 'XXX'),
     statusbot_server        => 'chat.freenode.net',

modules/openstack_project/manifests/eavesdrop.pp

@@ -2,7 +2,6 @@
 
 class openstack_project::eavesdrop (
   $nickpass = '',
-  $sysadmins = [],
   $statusbot_nick = '',
   $statusbot_password = '',
   $statusbot_server = '',
@@ -16,10 +15,6 @@ class openstack_project::eavesdrop (
   $accessbot_password = '',
   $project_config_repo = '',
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    sysadmins                 => $sysadmins
-  }
   include apache
   include meetbot