From bb456e970981d18162d4330deb2569590f2cb2a4 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 27 Nov 2019 16:27:11 +0100 Subject: [PATCH] Fix rsyslog issues This patch is fixing following issues, which makes rsyslog service to fail to start successfully: - Changes LoggingSource configuration key 'path' to 'file' for various services - Fixes LoggingSource configuration key 'startmsg.regex' for pacemaker - Removes nonexistent log files from LoggingSource of keystone Change-Id: I7fe6456a1d2a3ba4300a82c57b76774152422250 (cherry picked from commit cdda44028a5895438ef7fbabc10f23579db773f6) --- .../gnocchi/gnocchi-api-container-puppet.yaml | 5 --- .../heat/heat-api-cfn-container-puppet.yaml | 2 +- .../keystone/keystone-container-puppet.yaml | 33 +------------------ .../logging/rsyslog-container-puppet.yaml | 5 +-- .../neutron-l2gw-agent-baremetal-puppet.yaml | 2 +- .../nova/nova-metadata-container-puppet.yaml | 2 +- .../nova/nova-vnc-proxy-container-puppet.yaml | 2 +- .../ovn/ovn-metadata-container-puppet.yaml | 2 +- .../pacemaker/pacemaker-baremetal-puppet.yaml | 4 +-- 9 files changed, 11 insertions(+), 46 deletions(-) diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index c33169bf8a..bb44b846bb 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -87,11 +87,6 @@ parameters: MonitoringSubscriptionGnocchiApi: default: 'overcloud-gnocchi-api' type: string - GnocchiApiLoggingSource: - type: json - default: - tag: openstack.gnocchi.api - path: /var/log/gnocchi/app.log EnableInternalTLS: type: boolean default: false diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 44ed018ca4..506e9ff320 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -15,7 +15,7 @@ parameters: type: json default: tag: openstack.heat.api.cfn - path: /var/log/containers/heat/heat_api_cfn.log + file: /var/log/containers/heat/heat_api_cfn.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 8aeac3306b..ae7f96041a 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -128,31 +128,6 @@ parameters: default: tag: openstack.keystone file: /var/log/containers/keystone/keystone.log - KeystoneErrorLoggingSource: - type: json - default: - tag: openstack.keystone.error - file: /var/log/containers/httpd/keystone/error_log - KeystoneAdminAccessLoggingSource: - type: json - default: - tag: openstack.keystone.admin.access - file: /var/log/containers/httpd/keystone/keystone_wsgi_admin_access.log - KeystoneAdminErrorLoggingSource: - type: json - default: - tag: openstack.keystone.admin.error - file: /var/log/containers/httpd/keystone/keystone_wsgi_admin_error.log - KeystoneMainAcccessLoggingSource: - type: json - default: - tag: openstack.keystone.main.access - file: /var/log/containers/httpd/keystone/keystone_wsgi_main_access.log - KeystoneMainErrorLoggingSource: - type: json - default: - tag: openstack.keystone.wsgi.main.error - file: /var/log/containers/httpd/keystone/keystone_wsgi_main_error.log KeystonePolicies: description: | A hash of policies to configure for Keystone. @@ -552,13 +527,7 @@ outputs: - get_attr: [KeystoneLogging, config_settings] service_config_settings: rsyslog: - tripleo_logging_sources_keystone: - - {get_param: KeystoneLoggingSource} - - {get_param: KeystoneErrorLoggingSource} - - {get_param: KeystoneAdminAccessLoggingSource} - - {get_param: KeystoneAdminErrorLoggingSource} - - {get_param: KeystoneMainAcccessLoggingSource} - - {get_param: KeystoneMainErrorLoggingSource} + tripleo_logging_sources_keystone: {get_param: KeystoneLoggingSource} mysql: keystone::db::mysql::password: {get_param: AdminToken} keystone::db::mysql::user: keystone diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index 8bf5b5df3f..1a1056cc78 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -166,8 +166,8 @@ outputs: - {get_param: RsyslogElasticsearchSetting} - template: rsyslog-record searchIndex: rsyslog-node-index - dynSearchIndex: on - errorfile: '/var/log/rsyslog-omelasticsearch.log' + dynSearchIndex: "on" + errorfile: '/var/log/rsyslog/omelasticsearch.log' - if: - use_tls - tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert} @@ -212,6 +212,7 @@ outputs: - /var/lib/config-data/puppet-generated/rsyslog/:/var/lib/kolla/config_files/src:ro - /var/log/containers:/var/log/containers:ro - /var/log/containers/rsyslog:/var/log/rsyslog:rw,z + - /var/log:/var/log/host:ro - /var/lib/rsyslog.container:/var/lib/rsyslog:rw,z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml index 82a2d4a60e..6115bbafe6 100644 --- a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml @@ -71,7 +71,7 @@ parameters: type: json default: tag: openstack.neutron.agent.l2gw - path: /var/log/neutron/l2gw-agent.log + file: /var/log/neutron/l2gw-agent.log conditions: service_debug_unset: {equals: [{get_param: NeutronL2gwAgentDebug}, '']} diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 08188d052c..6c0c75e969 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -14,7 +14,7 @@ parameters: type: json default: tag: openstack.nova.api.metadata - file: /var/log/containers/nova/nova-api-metadata.log + file: /var/log/containers/nova/nova-metadata-api.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 51e98027c6..dbba63941c 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -14,7 +14,7 @@ parameters: type: json default: tag: openstack.nova.vncproxy - file: /var/log/containers/nova/nova-vncproxy.log + file: /var/log/containers/nova/nova-novncproxy.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 3b826057dd..9dfe396fc0 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -14,7 +14,7 @@ parameters: type: json default: tag: openstack.neutron.agent.ovn-metadata - path: /var/log/containers/neutron/networking-ovn-metadata-agent.log + file: /var/log/containers/neutron/networking-ovn-metadata-agent.log OVNEnableHaproxyDockerWrapper: description: Generate a wrapper script so that haproxy is launched in a separate container. type: boolean diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 63c2a06274..76581b0999 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -95,8 +95,8 @@ parameters: type: json default: tag: system.pacemaker - file: /var/log/pacemaker.log,/var/log/cluster/corosync.log - startmsg.regex: ^[^ ]*\s*[^ ]* [^ ]* \[[^ ]*\] [^ ]* + file: /var/log/host/pacemaker.log + startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}" UpgradeLeappEnabled: description: Use Leapp for operating system upgrade type: boolean