diff --git a/docker/services/rsyslog-sidecar.yaml b/docker/services/rsyslog-sidecar.yaml new file mode 100644 index 0000000000..708757fe51 --- /dev/null +++ b/docker/services/rsyslog-sidecar.yaml @@ -0,0 +1,65 @@ +heat_template_version: pike + +description: > + Containerized rsyslog-sidecar service + +parameters: + DockerRsyslogSidecarConfigImage: + description: The container image to use for the rsyslog-sidecar 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 + +resources: + + ContainersCommon: + type: ./containers-common.yaml + +outputs: + role_data: + description: Role data for the rsyslog-sidecar role. + value: + service_name: rsyslog_sidecar + config_settings: null + # BEGIN DOCKER SETTINGS + puppet_config: + config_volume: rsyslog_sidecar + puppet_tags: file + step_config: | + include ::tripleo::profile::base::rsyslog::sidecar + config_image: {get_param: DockerRsyslogSidecarConfigImage} + kolla_config: + /var/lib/kolla/config_files/rsyslog_sidecar.json: + command: /usr/sbin/rsyslogd -n + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + docker_config: {} + host_prep_tasks: null + upgrade_tasks: null diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index e77af49ec7..a89b527452 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -42,3 +42,4 @@ parameter_defaults: - OS::TripleO::Services::Docker - OS::TripleO::Services::Iscsid - OS::TripleO::Services::OVNController + - OS::TripleO::Services::RsyslogSidecar diff --git a/environments/stdout-logging.yaml b/environments/stdout-logging.yaml index ae1f047806..ea646ea159 100644 --- a/environments/stdout-logging.yaml +++ b/environments/stdout-logging.yaml @@ -1,4 +1,5 @@ resource_registry: + OS::TripleO::Services::RsyslogSidecar: ../docker/services/rsyslog-sidecar.yaml OS::TripleO::Services::Logging::GlanceApi: ../docker/services/logging/stdout/glance-api.yaml OS::TripleO::Services::Logging::HeatApi: ../docker/services/logging/stdout/heat-api.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 73462e6b0b..0d503a24d4 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -298,6 +298,7 @@ resource_registry: OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Services::CertmongerUser: OS::Heat::None OS::TripleO::Services::Clustercheck: OS::Heat::None + OS::TripleO::Services::RsyslogSidecar: OS::Heat::None OS::TripleO::Services::VRTSHyperScale: OS::Heat::None OS::TripleO::Services::SkydiveAgent: OS::Heat::None OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 9d1bef0807..8d7d0d3655 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -22,6 +22,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 8e62e8e7f4..ce3aa171c3 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -19,6 +19,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/Compute.yaml b/roles/Compute.yaml index d1b61d78c6..993fa380d4 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 78d23fb4c8..21128bdd65 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -37,6 +37,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 630cd264ff..cea1322db3 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -34,6 +34,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index af81000b0d..749e17c07d 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -37,6 +37,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 90c8fe8c85..9020e63b1b 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -126,6 +126,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::RabbitMQ - OS::TripleO::Services::Redis + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index b23a0c8102..e05a4af108 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -99,6 +99,7 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi - OS::TripleO::Services::Redis + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::SensuClient diff --git a/roles/Database.yaml b/roles/Database.yaml index e5c6b4d220..a2cd942b96 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -21,6 +21,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Pacemaker + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timezone diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index e2eacd9e95..2ca12a9865 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -27,6 +27,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles_data.yaml b/roles_data.yaml index e8979b25b5..2c8c7e5a42 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -129,6 +129,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::RabbitMQ - OS::TripleO::Services::Redis + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty @@ -196,6 +197,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent @@ -231,6 +233,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp @@ -268,6 +271,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp @@ -299,6 +303,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp