From 41af6e0e1428c327ffecddda221c87f916058c9c Mon Sep 17 00:00:00 2001
From: George Peristerakis <gperiste@redhat.com>
Date: Wed, 20 May 2015 13:39:09 -0400
Subject: [PATCH] Moved out the server class from the nodepool_prod class

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9f26a6e91a..fa90977c5b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -490,12 +490,16 @@ node 'status.openstack.org' {
 
 # Node-OS: trusty
 node 'nodepool.openstack.org' {
+  class { 'openstack_project::server':
+    sysadmins                 => hiera('sysadmins', []),
+    iptables_public_tcp_ports => [80],
+  }
+
   class { 'openstack_project::nodepool_prod':
     project_config_repo      => 'https://git.openstack.org/openstack-infra/project-config',
     mysql_password           => hiera('nodepool_mysql_password', 'XXX'),
     mysql_root_password      => hiera('nodepool_mysql_root_password', 'XXX'),
     nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
-    sysadmins                => hiera('sysadmins', []),
     statsd_host              => 'graphite.openstack.org',
     jenkins_api_user         => hiera('jenkins_api_user', 'username'),
     jenkins_api_key          => hiera('jenkins_api_key', 'XXX'),
diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp
index 936c319bff..c321bcafef 100644
--- a/modules/openstack_project/manifests/nodepool_prod.pp
+++ b/modules/openstack_project/manifests/nodepool_prod.pp
@@ -7,7 +7,6 @@ class openstack_project::nodepool_prod(
   $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
   $nodepool_logging_template = 'openstack_project/nodepool/nodepool.logging.conf.erb',
   $vhost_name = 'nodepool.openstack.org',
-  $sysadmins = [],
   $statsd_host = '',
   $jenkins_api_user ='',
   $jenkins_api_key ='',
@@ -26,11 +25,6 @@ class openstack_project::nodepool_prod(
   $project_config_repo = '',
   $clouds_yaml_template = 'openstack_project/nodepool/clouds.yaml.erb',
 ) {
-  class { 'openstack_project::server':
-    sysadmins                 => $sysadmins,
-    iptables_public_tcp_ports => [80],
-  }
-
   class { 'project_config':
     url  => $project_config_repo,
   }