From 474e8d914c4a92900236282c5bf9bffc3ca50b6b Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 19 Apr 2017 13:15:34 -0400
Subject: [PATCH] Move rsyslog into server.pp

Remove rsyslog from diskimages, as we want to manage it outside of
puppet.

Change-Id: I55b608edb826e9614682bb372898414c543a4865
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/server.pp | 37 +++++++++++++
 .../openstack_project/manifests/template.pp   | 53 -------------------
 2 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 03695ad310..1d3bdab4bd 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -24,7 +24,44 @@ class openstack_project::server (
     timezone => 'Etc/UTC',
   }
 
+  package { 'rsyslog':
+    ensure => present,
+  }
+
+  service { 'rsyslog':
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+    require    => Package['rsyslog'],
+  }
+
+  # Increase syslog message size in order to capture
+  # python tracebacks with syslog.
+  file { '/etc/rsyslog.d/99-maxsize.conf':
+    ensure  => present,
+    # Note MaxMessageSize is not a puppet variable.
+    content => '$MaxMessageSize 6k',
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    notify  => Service['rsyslog'],
+    require => Package['rsyslog'],
+  }
+
   if $::osfamily == 'Debian' {
+    # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
+    file { '/etc/rsyslog.d/50-default.conf':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      source  =>
+        'puppet:///modules/openstack_project/rsyslog.d_50-default.conf',
+      replace => true,
+      notify  => Service['rsyslog'],
+      require => Package['rsyslog'],
+    }
+
      # Purge and augment existing /etc/apt/sources.list if requested, and make
      # sure apt-get update is run before any packages are installed
      class { '::apt':
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 9c5d42f868..8edb5633f9 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -58,59 +58,6 @@ class openstack_project::template (
     install_users => $install_users
   }
 
-  package { 'rsyslog':
-    ensure => present,
-  }
-
-  if ($::in_chroot) {
-    notify { 'rsyslog in chroot':
-      message => 'rsyslog not refreshed, running in chroot',
-    }
-    $rsyslog_notify = []
-  } else {
-    service { 'rsyslog':
-      ensure     => running,
-      enable     => true,
-      hasrestart => true,
-      require    => Package['rsyslog'],
-    }
-    $rsyslog_notify = [ Service['rsyslog'] ]
-  }
-
-  ###########################################################
-  # System tweaks
-
-  # Increase syslog message size in order to capture
-  # python tracebacks with syslog.
-  file { '/etc/rsyslog.d/99-maxsize.conf':
-    ensure  => present,
-    # Note MaxMessageSize is not a puppet variable.
-    content => '$MaxMessageSize 6k',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    notify  => $rsyslog_notify,
-    require => Package['rsyslog'],
-  }
-
-  if $::osfamily == 'Debian' {
-
-    # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
-    file { '/etc/rsyslog.d/50-default.conf':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      source  =>
-        'puppet:///modules/openstack_project/rsyslog.d_50-default.conf',
-      replace => true,
-      notify  => $rsyslog_notify,
-      require => Package['rsyslog'],
-    }
-
-  }
-
-  ###########################################################
   if ($::osfamily == 'Debian') {
     # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
     # anything greater will use the OS version of puppet.