From 1bd9635d97bd40340ab5b6225d40ff3f8011ed75 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sat, 25 Mar 2017 14:55:29 +0100
Subject: [PATCH] Use openstack_project::server class where possible

As we move configuration for zuul worker nodes out of puppet and into
DIB elements, we should keep track of what is being managed by puppet
for long-lived servers and what no longer needs to be managed for single
use workers. The openstack_project::server class wraps the
openstack_server::template class which stores configuration that is
common to both types of machines. This patch updates the backup_server
and lists class to use the openstack_project::server class, updating
class parameters where they differ between o_p:server and o_p::template.
This way we can chop down the template class and move bits into the
server class until eventually we can entirely remove the
openstack_project::single_use_slave and openstack_project::template
classes.

Change-Id: Ief997d608a3a1632ec34da34ec46a237ead761f5
---
 manifests/site.pp                                    | 11 +++++++++++
 modules/openstack_project/manifests/backup_server.pp |  3 ---
 modules/openstack_project/manifests/lists.pp         |  7 -------
 modules/openstack_project/manifests/puppetdb.pp      |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 300a4154d7..8165f4e9e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -258,6 +258,12 @@ node 'groups-dev.openstack.org' {
 
 # Node-OS: trusty
 node 'lists.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [25, 80, 465],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
+
   class { 'openstack_project::lists':
     listadmins   => hiera('listadmins', []),
     listpassword => hiera('listpassword'),
@@ -1288,6 +1294,11 @@ node 'pbx.openstack.org' {
 # A backup machine.  Don't run cron or puppet agent on it.
 node /^ci-backup-.*\.openstack\.org$/ {
   $group = "ci-backup"
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
   include openstack_project::backup_server
 }
 
diff --git a/modules/openstack_project/manifests/backup_server.pp b/modules/openstack_project/manifests/backup_server.pp
index 0a8ee2f5ed..d789b9dd5e 100644
--- a/modules/openstack_project/manifests/backup_server.pp
+++ b/modules/openstack_project/manifests/backup_server.pp
@@ -1,9 +1,6 @@
 # == Class: openstack_project::backup_server
 #
 class openstack_project::backup_server {
-  class { 'openstack_project::template':
-    iptables_public_tcp_ports => [],
-  }
   package { 'bup':
     ensure => present,
   }
diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
index 7d181e4378..1d6bdd2614 100644
--- a/modules/openstack_project/manifests/lists.pp
+++ b/modules/openstack_project/manifests/lists.pp
@@ -4,13 +4,6 @@ class openstack_project::lists(
   $listadmins,
   $listpassword = ''
 ) {
-  # Using openstack_project::template instead of openstack_project::server
-  # because the exim config on this machine is almost certainly
-  # going to be more complicated than normal.
-  class { 'openstack_project::template':
-    iptables_public_tcp_ports => [25, 80, 465],
-  }
-
   $listdomain = 'lists.openstack.org'
 
   class { 'exim':
diff --git a/modules/openstack_project/manifests/puppetdb.pp b/modules/openstack_project/manifests/puppetdb.pp
index 4531cf2c7c..926de2501f 100644
--- a/modules/openstack_project/manifests/puppetdb.pp
+++ b/modules/openstack_project/manifests/puppetdb.pp
@@ -22,7 +22,7 @@ class openstack_project::puppetdb (
 
   class { 'puppetdb::database::postgresql':
     require         => [User['postgres'],
-      Class['openstack_project::template'],],
+      Class['openstack_project::server'],],
   }
 
   class { '::puppetdb::server':