From b76a1c138d01bfd05fdbbfba367ddf7299fba39e Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sat, 8 Apr 2017 21:00:17 +0200
Subject: [PATCH] Move package and file purging to o_p::server

*-minimal images don't have byobu, whoopsie, or popularity-contest
installed on them, so there is no need to purge them from
single_use_slave. We can move these over to openstack_project::server to
help empty out openstack_project::template.

Change-Id: I3b39a89269e424f3d1c5806f35c743937c92f3f8
---
 modules/openstack_project/manifests/server.pp   | 17 +++++++++++++++++
 modules/openstack_project/manifests/template.pp | 14 --------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index ad118b4271..ac3df80dc7 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -95,6 +95,23 @@ class openstack_project::server (
 
   include snmpd
 
+  # We don't like byobu
+  file { '/etc/profile.d/Z98-byobu.sh':
+    ensure => absent,
+  }
+
+  if $::osfamily == 'Debian' {
+    # Ubuntu installs their whoopsie package by default, but it eats through
+    # memory and we don't need it on servers
+    package { 'whoopsie':
+      ensure => absent,
+    }
+
+    package { 'popularity-contest':
+      ensure => absent,
+    }
+  }
+
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports,
     iptables_public_udp_ports => $iptables_public_udp_ports,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 32c928156d..046ca90d0d 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -106,11 +106,6 @@ class openstack_project::template (
     require => Package['rsyslog'],
   }
 
-  # We don't like byobu
-  file { '/etc/profile.d/Z98-byobu.sh':
-    ensure => absent,
-  }
-
   if $::osfamily == 'Debian' {
 
     # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
@@ -126,15 +121,6 @@ class openstack_project::template (
       require => Package['rsyslog'],
     }
 
-    # Ubuntu installs their whoopsie package by default, but it eats through
-    # memory and we don't need it on servers
-    package { 'whoopsie':
-      ensure => absent,
-    }
-
-    package { 'popularity-contest':
-      ensure => absent,
-    }
   }
 
   ###########################################################