From 0f01a53090754446eaa32f0085fcf34a401f7159 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Fri, 10 Apr 2015 17:36:44 +0200
Subject: [PATCH] Move server outside of puppetmaster class

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f271baeff4..7cbfccc01b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -175,10 +175,13 @@ node 'cacti.openstack.org' {
 
 # Node-OS: precise
 node 'puppetmaster.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [4505, 4506, 8140],
+    sysadmins                 => hiera('sysadmins', []),
+    pin_puppet                => '3.6.',
+  }
   class { 'openstack_project::puppetmaster':
     root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
-    sysadmins    => hiera('sysadmins', []),
-    version      => '3.6.',
   }
 }
 
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 070c8c47c3..c25fecf2e7 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -2,24 +2,12 @@
 #
 class openstack_project::puppetmaster (
   $root_rsa_key = 'xxx',
-  $sysadmins = [],
-  $version   = '3.',
-  $ca_server = undef,
   $puppetdb = true,
   $puppetdb_server = 'puppetdb.openstack.org',
-  $puppetmaster_server = 'puppetmaster.openstack.org',
 ) {
   include logrotate
   include openstack_project::params
 
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [4505, 4506, 8140],
-    sysadmins                 => $sysadmins,
-    pin_puppet                => $version,
-    ca_server                 => $ca_server,
-    puppetmaster_server       => $puppetmaster_server,
-  }
-
   file {'/etc/puppet/environments':
     ensure => directory,
     owner  => 'root',