From 655328bb2f22331893614e0c1d39f9eab028ce2a Mon Sep 17 00:00:00 2001
From: George Peristerakis <gperiste@redhat.com>
Date: Wed, 20 May 2015 10:00:28 -0400
Subject: [PATCH] Moved out the server class from the etherpad and etherpad-dev
 classes

Change-Id: If08e1eb8bacfbbf88546813b8b6dcd2ae2e7c8ee
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
---
 manifests/site.pp                                   | 12 ++++++++++--
 modules/openstack_project/manifests/etherpad.pp     |  8 +-------
 modules/openstack_project/manifests/etherpad_dev.pp |  8 +-------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9f26a6e91a..0388977944 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -281,6 +281,11 @@ node 'eavesdrop.openstack.org' {
 
 # Node-OS: precise
 node 'etherpad.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::etherpad':
     ssl_cert_file_contents  => hiera('etherpad_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('etherpad_ssl_key_file_contents', 'XXX'),
@@ -288,17 +293,20 @@ node 'etherpad.openstack.org' {
     mysql_host              => hiera('etherpad_db_host', 'localhost'),
     mysql_user              => hiera('etherpad_db_user', 'username'),
     mysql_password          => hiera('etherpad_db_password', 'XXX'),
-    sysadmins               => hiera('sysadmins', []),
   }
 }
 
 # Node-OS: precise
 node 'etherpad-dev.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::etherpad_dev':
     mysql_host          => hiera('etherpad-dev_db_host', 'localhost'),
     mysql_user          => hiera('etherpad-dev_db_user', 'username'),
     mysql_password      => hiera('etherpad-dev_db_password', 'XXX'),
-    sysadmins           => hiera('sysadmins', []),
   }
 }
 
diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp
index be69d4bfde..9c4f1d05de 100644
--- a/modules/openstack_project/manifests/etherpad.pp
+++ b/modules/openstack_project/manifests/etherpad.pp
@@ -8,14 +8,8 @@ class openstack_project::etherpad (
   $ssl_chain_file_contents = '',
   $mysql_host = 'localhost',
   $mysql_user = 'eplite',
-  $mysql_db_name = 'etherpad-lite',
-  $sysadmins = []
+  $mysql_db_name = 'etherpad-lite'
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins
-  }
-
   class { 'etherpad_lite':
     ep_ensure      => 'latest',
     eplite_version => '24b0712d77abb91ebea2d67f06f565861ec008f0',
diff --git a/modules/openstack_project/manifests/etherpad_dev.pp b/modules/openstack_project/manifests/etherpad_dev.pp
index 8fa7898cee..54b9aa03b7 100644
--- a/modules/openstack_project/manifests/etherpad_dev.pp
+++ b/modules/openstack_project/manifests/etherpad_dev.pp
@@ -2,14 +2,8 @@ class openstack_project::etherpad_dev (
   $mysql_password,
   $mysql_host = 'localhost',
   $mysql_user = 'eplite',
-  $mysql_db_name = 'etherpad-lite',
-  $sysadmins = []
+  $mysql_db_name = 'etherpad-lite'
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins
-  }
-
   class { 'etherpad_lite':
     ep_ensure => 'latest',
   }