Add missed 30-remote-log.conf for docker container

Add missed 30-remote.conf template for rsyslog docker container
Fix existing dependency issue (rsyslog::server wipes templates dir)
Fix default access and notification for rsyslog.d file resources
Purge confusing nailgun templates for syslog (not used anymore)

Closes-bug: #1328877

Change-Id: If6f256cfeeba5bee486dd45c34cbc56c9e721730
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>

deployment/puppet/nailgun/examples/rsyslog-only.pp

@@ -9,6 +9,17 @@ class {"::rsyslog::server":
   high_precision_timestamps => true,
 }
 
+# Fuel specific config for logging parse formats used for /var/log/remote
+$logconf = "${::rsyslog::params::rsyslog_d}30-remote-log.conf"
+file { $logconf :
+    content => template('openstack/30-server-remote-log.conf.erb'),
+    require => Class['::rsyslog::server'],
+    owner => root,
+    group => $::rsyslog::params::run_group,
+    mode => 0640,
+    notify  => Class["::rsyslog::service"],
+}
+
 class {"::openstack::logrotate":
   role           => 'server',
   rotation       => 'weekly',

deployment/puppet/nailgun/manifests/rsyslog.pp

@@ -1,34 +0,0 @@
-class nailgun::rsyslog {
-
-  file { "/etc/rsyslog.d/30-remote-log.conf":
-    content => template("nailgun/rsyslog/30-remote-log.conf.erb"),
-    owner => "root",
-    group => "root",
-    mode => 0644,
-    notify => Service["rsyslog"],
-  }
-
-  file { "/etc/sysconfig/rsyslog":
-    content => template("nailgun/rsyslog/rsyslog.erb"),
-    owner => "root",
-    group => "root",
-    mode => 0644,
-    notify => Service["rsyslog"],
-  }
-  file { "/etc/rsyslog.d/50-puppet-log.conf":
-    content => template("nailgun/rsyslog/50-puppet-log.conf.erb"),
-    owner => "root",
-    group => "root",
-    mode => 0644,
-    notify => Service["rsyslog"],
-  }
-
-
-  service { "rsyslog":
-    enable => true,
-    ensure => "running",
-    require => Package["rsyslog"],
-  }
-
-}
-

deployment/puppet/nailgun/templates/rsyslog/30-remote-log.conf.erb

@@ -1,10 +0,0 @@
-# provides UDP syslog reception
-$ModLoad imudp
-$UDPServerRun 514
-$EscapeControlCharactersOnReceive off
-
-# remote anaconda logs
-$template RemoteLog, "%$NOW%T%TIMESTAMP:8:$% %syslogseverity-text%: %msg%\n"
-$template RemoteLogFile, "/var/log/remote/%FROMHOST%/%APP-NAME%.log"
-:FROMHOST, regex, "^[1-9]" ?RemoteLogFile;RemoteLog
-:FROMHOST, regex, "^[1-9]" ~

deployment/puppet/nailgun/templates/rsyslog/50-puppet-log.conf.erb

@@ -1,4 +0,0 @@
-# Collect Puppet logs
-$template PuppetLog, "%$NOW%T%TIMESTAMP:8:$% %syslogseverity-text%: %msg%\n"
-$template PuppetLogFile, "/var/log/puppet/%APP-NAME%.log"
-:APP-NAME, regex, "puppet" ?PuppetLogFile;PuppetLog

deployment/puppet/nailgun/templates/rsyslog/rsyslog.erb

@@ -1,5 +0,0 @@
-# Options for rsyslogd
-# Syslogd options are deprecated since rsyslog v3.
-# If you want to use them, switch to compatibility mode 2 by "-c 2"
-# See rsyslogd(8) for more details
-SYSLOGD_OPTIONS="-c 5 -x"

deployment/puppet/openstack/manifests/logging.pp

@@ -46,6 +46,14 @@ class openstack::logging (
 
   include ::rsyslog::params
 
+  # Set access and notifications for rsyslog client
+  File {
+    owner => root,
+    group => $::rsyslog::params::run_group,
+    mode => 0640,
+    notify  => Class["::rsyslog::service"],
+  }
+
   # Configure syslog roles
   if $role == 'client' {
 
@@ -99,14 +107,6 @@ class openstack::logging (
       notify  => Class["::rsyslog::service"],
     }
 
-    # Set access and notifications for rsyslog client
-    File {
-      owner => root,
-      group => $::rsyslog::params::run_group,
-      mode => 0640,
-      notify  => Class["::rsyslog::service"],
-    }
-
     # OS syslog configs for rsyslog client
     file { "${::rsyslog::params::rsyslog_d}10-nova.conf":
       ensure => present,
@@ -221,12 +221,6 @@ class openstack::logging (
       $enable_udp = $proto ? { 'udp' => true, 'both' => true, default => true }
     }
 
-    # Fuel specific config for logging parse formats used for /var/log/remote
-    $logconf = "${::rsyslog::params::rsyslog_d}30-remote-log.conf"
-    file { $logconf :
-        content => template("${module_name}/30-server-remote-log.conf.erb"),
-    }
-
     class {"::rsyslog::server":
       enable_tcp                 => $enable_tcp,
       enable_udp                 => $enable_udp,
@@ -234,6 +228,14 @@ class openstack::logging (
       high_precision_timestamps  => $show_timezone,
       port                       => $port,
     }
+
+    # Fuel specific config for logging parse formats used for /var/log/remote
+    $logconf = "${::rsyslog::params::rsyslog_d}30-remote-log.conf"
+    file { $logconf :
+        content => template("${module_name}/30-server-remote-log.conf.erb"),
+        require => Class['::rsyslog::server'],
+    }
+
   }
 
   # Configure log rotation