diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index e9207c56d4..788aa65698 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -15,6 +15,7 @@ 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 @@ -91,6 +92,7 @@ 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::Fluentd @@ -172,6 +174,8 @@ parameter_defaults: #MonitoringRabbitHost: 127.0.0.1 #MonitoringRabbitPort: 5676 #MonitoringRabbitPassword: sensu + RsyslogElasticsearchSetting: + Server: '127.0.0.1:9200' TtyValues: - console - tty1 diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml new file mode 100644 index 0000000000..baa2832dca --- /dev/null +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -0,0 +1,229 @@ +heat_template_version: rocky + +description: > + Containerized rsyslogd service for purposes of centralized log collection + of OpenStack services' logs. + +parameters: + DockerRsyslogImage: + description: The container image to use for container + type: string + DockerRsyslogConfigImage: + description: The container image to use for the rsyslog config_volume + type: string + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + RsyslogElasticsearchSetting: + default: {} + description: Configuration for rsyslog-elasticsearch plugin + type: json + RsyslogElasticsearchTlsCACert: + default: '' + description: Contains content of the CA cert for the CA that issued Elasticsearch server cert. + type: string + RsyslogElasticsearchTlsClientCert: + default: '' + description: Contains content of the client cert for doing client cert auth against Elasticsearch. + type: string + RsyslogElasticsearchTlsClientKey: + default: '' + description: Contains content of the private key corresponding to the cert RsyslogElasticsearchTlsClientCert. + type: string + +resources: + ContainersCommon: + type: ../containers-common.yaml + +conditions: + use_tls: + not: + and: + - equals: [{get_param: RsyslogElasticsearchTlsCACert}, ''] + - equals: [{get_param: RsyslogElasticsearchTlsClientCert}, ''] + - equals: [{get_param: RsyslogElasticsearchTlsClientKey}, ''] + +outputs: + role_data: + description: Role data for the rsyslog role. + value: + service_name: rsyslog + config_settings: + map_merge: + # puppet-rsyslog does not have params.pp with deault values for parameters + # so we need to add those here or include module's data/common.yaml in hiera + - rsyslog::confdir: /etc/rsyslog.d + rsyslog::package_name: rsyslog + rsyslog::package_version: installed + rsyslog::manage_package: true + rsyslog::manage_confdir: true + rsyslog::purge_config_files: true + rsyslog::override_default_config: true + rsyslog::config_file: /etc/rsyslog.conf + rsyslog::manage_service: true + rsyslog::service_name: rsyslog + rsyslog::service_status: running + rsyslog::service_enabled: true + rsyslog::external_service: false + rsyslog::use_upstream_repo: false + rsyslog::feature_packages: + - rsyslog-elasticsearch + - rsyslog-mmnormalize + rsyslog::global_config_priority: 10 + rsyslog::module_load_priority: 20 + rsyslog::input_priority: 30 + rsyslog::main_queue_priority: 40 + rsyslog::parser_priority: 45 + rsyslog::template_priority: 50 + rsyslog::filter_priority: 55 + rsyslog::action_priority: 60 + rsyslog::ruleset_priority: 65 + rsyslog::lookup_table_priority: 70 + rsyslog::legacy_config_priority: 80 + rsyslog::custom_priority: 90 + rsyslog::target_file: 50_openstack_logs.conf + rsyslog::server::modules: + imfile: {} + omelasticsearch: {} + # output setting + rsyslog::server::templates: + rsyslog-node-index: + type: list + list_descriptions: + - constant: + value: "%{hiera('fqdn_canonical')}-" + - property: + name: timereported + dateFormat: year + - constant: + value: '.' + - property: + name: timereported + dateFormat: month + - constant: + value: '.' + - property: + name: timereported + dateFormat: day + rsyslog-record: + type: list + options: + jsonf: 'on' + list_descriptions: + - property: + outname: '@timestamp' + name: timereported + format: jsonf + - property: + outname: host + name: hostname + format: jsonf + - property: + outname: severity + name: syslogseverity-text + format: jsonf + - property: + outname: facility + name: syslogfacility-text + format: jsonf + - property: + outname: tag + name: syslogtag + format: jsonf + - property: + outname: source + name: app-name + format: jsonf + - property: + outname: message + name: msg + format: jsonf + tripleo::profile::base::logging::rsyslog::elasticsearch: + map_merge: + - {get_param: RsyslogElasticsearchSetting} + - template: rsyslog-record + searchIndex: rsyslog-node-index + dynSearchIndex: on + errorfile: '/var/log/rsyslog-omelasticsearch.log' + - if: + - use_tls + - tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert} + tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_cert: {get_param: RsyslogElasticsearchTlsClientCert} + tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_key: {get_param: RsyslogElasticsearchTlsClientKey} + - {} + # BEGIN DOCKER SETTINGS + puppet_config: + config_volume: rsyslog + puppet_tags: 'rsyslog::generate_concat,concat::fragment' + step_config: include ::tripleo::profile::base::logging::rsyslog + config_image: {get_param: DockerRsyslogConfigImage} + kolla_config: + /var/lib/kolla/config_files/rsyslog.json: + command: /usr/sbin/rsyslogd -n + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + permissions: + - path: /var/lib/rsyslog + owner: root:root + recurse: true + - path: /var/log/rsyslog + owner: root:root + recurse: true + docker_config: + step_3: + rsyslog: + image: {get_param: DockerRsyslogImage} + net: host + privileged: true + user: root + restart: always + security_opt: 'label=disable' + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/rsyslog.json:/var/lib/kolla/config_files/config.json:ro + - /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 + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + host_prep_tasks: + - name: create persistent logs directory for rsyslog + file: + path: /var/log/containers/rsyslog + state: directory + setype: svirt_sandbox_file_t + - name: rsyslog logs readme + copy: + dest: /var/log/rsyslog/readme.txt + content: | + Log files from rsyslog containers can be found under + /var/log/containers/rsyslog. + ignore_errors: true diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 3df3ddff9d..1e4ad03b6b 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -59,6 +59,7 @@ parameter_defaults: - OS::TripleO::Services::Multipathd - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::LoginDefs - OS::TripleO::Services::Rhsm diff --git a/environments/logging-environment-rsyslog.yaml b/environments/logging-environment-rsyslog.yaml new file mode 100644 index 0000000000..6d577733ce --- /dev/null +++ b/environments/logging-environment-rsyslog.yaml @@ -0,0 +1,5 @@ +## A Heat environment file which can be used to set up +## logging agents + +resource_registry: + OS::TripleO::Services::Rsyslog: ../deployment/logging/rsyslog-container-puppet.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 59ca6ebbec..a881f8c988 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -316,6 +316,7 @@ resource_registry: OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml OS::TripleO::Services::CertmongerUser: deployment/certs/certmonger-user-baremetal-puppet.yaml OS::TripleO::Services::Clustercheck: OS::Heat::None + OS::TripleO::Services::Rsyslog: OS::Heat::None OS::TripleO::Services::RsyslogSidecar: OS::Heat::None OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::SkydiveAgent: OS::Heat::None diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 8abd937e44..644dce5934 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -36,6 +36,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/CellController.yaml b/roles/CellController.yaml index 93de0a7121..a1196a7842 100644 --- a/roles/CellController.yaml +++ b/roles/CellController.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index ef8addfdf2..f92e333636 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -36,6 +36,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index d1dbcaf315..209572693d 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -33,6 +33,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index c8d8171a9e..aa490a4a00 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -33,6 +33,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index ea4fe39ccf..5d5b961950 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -32,6 +32,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 797e19a588..ded73eec65 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -66,6 +66,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 863f7aa800..ec0d730c03 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClientAlt - OS::TripleO::Services::SkydiveAgent diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index ad610ea925..c237558f71 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 3c4b3a033e..4f16808f19 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml index bce7d32b6d..f66c78c76a 100644 --- a/roles/ComputeHCIOvsDpdk.yaml +++ b/roles/ComputeHCIOvsDpdk.yaml @@ -54,6 +54,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 7a96ddefa5..7169219d97 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::PacemakerRemote - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index d072b44338..4668787da8 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index 81623ecf3e..beb10b903d 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -55,6 +55,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index de75ed280c..062b888a01 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -54,6 +54,7 @@ - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 6bb46ad414..d935662eff 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -55,6 +55,7 @@ - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index 34f8cc7840..85bd9d8bac 100644 --- a/roles/ComputeOvsDpdkSriov.yaml +++ b/roles/ComputeOvsDpdkSriov.yaml @@ -51,6 +51,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index fac4803489..774ea7aedc 100644 --- a/roles/ComputeOvsDpdkSriovRT.yaml +++ b/roles/ComputeOvsDpdkSriovRT.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index da3168a0a8..997311b8d9 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -52,6 +52,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index 33a443bab4..e0bc7f9513 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -55,6 +55,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 1812961d3c..615be2bca8 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -59,6 +59,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index f04d16948d..3c1476a57a 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -51,6 +51,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 06e748a171..09452a17b0 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -53,6 +53,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/Controller.yaml b/roles/Controller.yaml index a1fa6afcab..59b8596377 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -164,6 +164,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 6ac0386910..5f8a6947ea 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -116,6 +116,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 495188d13e..4925877f38 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -157,6 +157,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 00b03dd9e2..b27981da16 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -133,6 +133,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 736e28fbd6..0fa8204f8c 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -129,6 +129,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 1957f1779a..84eba43821 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -166,6 +166,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/Database.yaml b/roles/Database.yaml index ffeef5c66f..4bcddccf90 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -30,6 +30,7 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 25d6bd6aa8..03d59c9e4c 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -52,6 +52,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index 13fed2aa1e..f0ec26eaaf 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -60,6 +60,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index 1de15da4d4..b1cff84e34 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -59,6 +59,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 704c01df5d..6b8fba3ba7 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -55,6 +55,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 41d8c4b83d..2d6ef00330 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -56,6 +56,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index f2385a4acb..3eab12ce9b 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -55,6 +55,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 605e1ec726..a42a1e50ed 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -31,6 +31,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timesync diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 3ba7fdea67..7d0fd08339 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -29,6 +29,7 @@ - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timesync diff --git a/roles/Networker.yaml b/roles/Networker.yaml index d76616b34f..e8bc7dd568 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -42,6 +42,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index 530c9a425d..f6b33c8323 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -36,6 +36,7 @@ - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 292a7edf98..bf6b4ec048 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -40,6 +40,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 68e88d8004..d1c6e87cab 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -165,6 +165,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 214024cabd..710ba5ebde 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles_data.yaml b/roles_data.yaml index 0021bd40f8..682e3f0a01 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -167,6 +167,7 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine @@ -256,6 +257,7 @@ - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient @@ -308,6 +310,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient @@ -360,6 +363,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient @@ -407,6 +411,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient