Merge "Replace rsyslog::server by rsyslog::config"

manifests/profile/base/logging/rsyslog.pp

@@ -146,7 +146,8 @@ class tripleo::profile::base::logging::rsyslog (
 
     $modules = $modules_es + $modules_qdr
     $actions = $actions_es + $actions_qdr
-    class { 'rsyslog::server':
+    include rsyslog
+    class { 'rsyslog::config':
       modules => $modules,
       actions => $actions
     }

spec/defines/tripleo_profile_base_logging_rsyslog_file_input_spec.rb

@@ -21,7 +21,10 @@ describe 'tripleo::profile::base::logging::rsyslog::file_input' do
   let(:title) { 'foobar' }
 
   let :pre_condition do
-    'include rsyslog::server'
+    <<-EOS
+    include rsyslog
+    include rsyslog::config
+EOS
   end
 
   shared_examples_for 'tripleo::profile::base::logging::rsyslog::file_input' do