Merge "Adapt on puppet-rsyslog update"

ci/environments/scenario001-multinode-containers.yaml

@@ -17,7 +17,6 @@ resource_registry:
   OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
-  OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -88,7 +87,6 @@ parameter_defaults:
     - OS::TripleO::Services::CinderVolume
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::MetricsQdr
-    - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::Iscsid
@@ -155,8 +153,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
-  RsyslogElasticsearchSetting:
-    Server: '127.0.0.1:9200'
   TtyValues:
     - console
     - tty1

ci/environments/scenario001-standalone.yaml

@@ -26,6 +26,7 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Rear: ../../deployment/backup-and-restore/rear-baremetal-ansible.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
+  OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-container-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
@@ -221,3 +222,5 @@ parameter_defaults:
   NovaShowHostStatus: all
   NovaApiHostStatusPolicy: >
     (role:reader and system_scope:all) or (role:reader and project_id:%(project_id)s)
+  RsyslogElasticsearchSetting:
+    Server: '127.0.0.1:9200'

deployment/logging/rsyslog-container-puppet.yaml

@@ -162,12 +162,12 @@ outputs:
             rsyslog::legacy_config_priority: 80
             rsyslog::custom_priority: 90
             rsyslog::target_file: 50_openstack_logs.conf
-            rsyslog::server::modules:
+            rsyslog::config::modules:
               imfile: {}
               omelasticsearch: {}
               omamqp1: {}
             # output setting
-            rsyslog::server::templates:
+            rsyslog::config::templates:
               rsyslog-node-index:
                 type: list
                 list_descriptions: