From 012b5c585e080c0ede9518b9ac844d8e81a53a47 Mon Sep 17 00:00:00 2001
From: Mikhail S Medvedev <mmedvede@us.ibm.com>
Date: Thu, 9 Jul 2015 14:40:01 -0500
Subject: [PATCH] Move out server class from subunit_worker.pp

Change-Id: Ic23472198c6a1842398c2a44de4a08ef89e1fb71
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.htm
---
 manifests/site.pp                                     | 5 ++++-
 modules/openstack_project/manifests/subunit_worker.pp | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 596f0d8da4..108f55add4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -402,8 +402,11 @@ node /^logstash-worker\d+\.openstack\.org$/ {
 # Node-OS: trusty
 node /^subunit-worker\d+\.openstack\.org$/ {
   $group = "subunit-worker"
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22],
+    sysadmins                 => hiera('sysadmins', []),
+  }
   class { 'openstack_project::subunit_worker':
-    sysadmins           => hiera('sysadmins', []),
     subunit2sql_db_host => hiera('subunit2sql_db_host', ''),
     subunit2sql_db_pass => hiera('subunit2sql_db_password', ''),
   }
diff --git a/modules/openstack_project/manifests/subunit_worker.pp b/modules/openstack_project/manifests/subunit_worker.pp
index a7a7d681a7..fd71d587c9 100644
--- a/modules/openstack_project/manifests/subunit_worker.pp
+++ b/modules/openstack_project/manifests/subunit_worker.pp
@@ -15,15 +15,9 @@
 # subunit2sql worker glue class.
 #
 class openstack_project::subunit_worker (
-  $sysadmins = [],
   $subunit2sql_db_host,
   $subunit2sql_db_pass,
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22],
-    sysadmins                 => $sysadmins,
-  }
-
   include subunit2sql
   subunit2sql::worker { 'A':
     config_file        => 'puppet:///modules/openstack_project/logstash/jenkins-subunit-worker.yaml',