From 118b2762deea1eb8175ed6d32038ecccbaa8521b Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Mon, 9 Mar 2015 17:50:01 -0700
Subject: [PATCH] Move openstack_project::server to node def

Partial implementation of:
http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html

This pulls the openstack_project::server class out of the paste class
meaning only parameters actually needed by the paste class are passed
in to the paste class.

Change-Id: Iba93853c12f84271d4991679dfe80c2ca9e07d8f
Story: 2000172
---
 manifests/site.pp                            | 5 ++++-
 modules/openstack_project/manifests/paste.pp | 5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index dfe2629f63..3c35188673 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -236,10 +236,13 @@ node 'lists.openstack.org' {
 
 # Node-OS: precise
 node 'paste.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    sysadmins                 => hiera('sysadmins', []),
+  }
   class { 'openstack_project::paste':
     db_password         => hiera('paste_db_password', 'XXX'),
     mysql_root_password => hiera('paste_mysql_root_password', 'XXX'),
-    sysadmins           => hiera('sysadmins', []),
   }
 }
 
diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp
index 9a958ad52a..f8c6382dc7 100644
--- a/modules/openstack_project/manifests/paste.pp
+++ b/modules/openstack_project/manifests/paste.pp
@@ -3,12 +3,7 @@
 class openstack_project::paste (
   $db_password,
   $mysql_root_password,
-  $sysadmins = []
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    sysadmins                 => $sysadmins,
-  }
   include lodgeit
   lodgeit::site { 'openstack':
     db_host     => 'localhost',