Fix proto&port options for openstack::logging

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>

deployment/puppet/openstack/manifests/logging.pp

@@ -54,9 +54,10 @@ if $role == 'client' {
     action  => 'accept',
   } ->
   class {"::rsyslog::server": 
-    enable_tcp => $proto == 'tcp' ? { true => 'true', default =>'false' },
-    enable_udp => $proto == 'udp' ? { true => 'true', default =>'true' },
+    enable_tcp => $proto ? { 'tcp' => true, default => false },
+    enable_udp => $proto ? { 'udp' => true, default => true },
     server_dir => '/var/log/',
+    port       => $port,
     high_precision_timestamps => $show_timezone,
     virtual    => $virtual,
   } -> 

deployment/puppet/rsyslog/manifests/server.pp

@@ -5,6 +5,7 @@
 class rsyslog::server (
   $enable_tcp                = true,
   $enable_udp                = true,
+  $port                      = '514',
   $server_dir                = '/srv/log/',
   $custom_config             = undef,
   $high_precision_timestamps = false,

deployment/puppet/rsyslog/templates/00-server.conf.erb

@@ -3,18 +3,12 @@
 <% if scope.lookupvar('rsyslog::server::enable_udp') -%>
 # Load UDP module
 $ModLoad imudp
+$UDPServerRun <%= scope.lookupvar('rsyslog::server::port') %>
 <% end -%>
 
 <% if scope.lookupvar('rsyslog::server::enable_tcp') -%>
 # Load TCP module
 $ModLoad imtcp
-<% end -%>
-
-<% if scope.lookupvar('rsyslog::server::enable_udp') -%>
-$UDPServerRun <%= scope.lookupvar('rsyslog::server::port') %>
-<% end -%>
-
-<% if scope.lookupvar('rsyslog::server::enable_tcp') -%>
 $InputTCPServerRun <%= scope.lookupvar('rsyslog::server::port') %>
 <% end -%>