From 252c41d511217c78c9ceb8405898bfddc614b3e9 Mon Sep 17 00:00:00 2001
From: George Peristerakis <gperiste@redhat.com>
Date: Fri, 15 May 2015 16:53:38 -0400
Subject: [PATCH] Move the server class settings out of the ask class

Story: 2000172
Spec:
http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html

Change-Id: I5e3c076c98cee4605f90f8dab473039221cc1c50
---
 manifests/site.pp                          | 7 ++++++-
 modules/openstack_project/manifests/ask.pp | 6 ------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9f26a6e91a..5085fcdf23 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -749,8 +749,13 @@ node /^afs.*\..*\.openstack\.org$/ {
 
 # Node-OS: precise
 node 'ask.openstack.org' {
+
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::ask':
-    sysadmins                    => hiera('sysadmins', []),
     db_user                      => hiera('ask_db_user', 'ask'),
     db_password                  => hiera('ask_db_password', 'XXX'),
     redis_password               => hiera('ask_redis_password', 'XXX'),
diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index 8e400b9133..0b6288c194 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -3,7 +3,6 @@
 # ask.openstack.org Q&A support website
 #
 class openstack_project::ask (
-  $sysadmins = [],
   $db_name = 'askbotdb',
   $db_user = undef,
   $db_password = undef,
@@ -23,11 +22,6 @@ class openstack_project::ask (
   $site_name = 'ask.openstack.org',
   $solr_version = '4.7.2',
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins,
-  }
-
   # solr search engine
   class { 'solr':
     mirror  => 'http://apache.mesi.com.ar/lucene/solr',