From f982eb55c4be728060fb7d8d036c98a4721cb155 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Thu, 24 Aug 2017 21:22:57 -0700 Subject: [PATCH] logging: merge fluentd-client and fluentd-base The fluentd implementation was originally split across multiple files in order to support both client and server services. we ultimately decided to only implement the client as part of tripleo so this division is no longer necessary. This commit merges fluentd-client.yaml and fluentd-base.yaml into fluentd.yaml, and renames things appropriately. Partial-bug: #1715187 Depends-On: Iace34b7baae8822d2233d97adabf6ebc8833adab Change-Id: Idb9886f04d56ffc75a78c4059ff319b58b4acf9f --- .../scenario001-multinode-containers.yaml | 6 +- ci/environments/scenario001-multinode.yaml | 4 +- .../deployed-server-roles-data.yaml | 10 +-- .../{fluentd-client.yaml => fluentd.yaml} | 8 +-- .../contrail/roles_data_contrail.yaml | 20 +++--- environments/hyperconverged-ceph.yaml | 2 +- environments/logging-environment.yaml | 2 +- .../services-docker/fluentd-client.yaml | 2 - environments/services-docker/fluentd.yaml | 2 + overcloud-resource-registry-puppet.j2.yaml | 2 +- puppet/services/logging/fluentd-base.yaml | 49 ------------- .../{fluentd-client.yaml => fluentd.yaml} | 68 +++++++++---------- roles/BlockStorage.yaml | 2 +- roles/CephStorage.yaml | 2 +- roles/Compute.yaml | 2 +- roles/ComputeHCI.yaml | 2 +- roles/ComputeOvsDpdk.yaml | 2 +- roles/ComputeSriov.yaml | 2 +- roles/Controller.yaml | 2 +- roles/ControllerOpenstack.yaml | 2 +- roles/Database.yaml | 2 +- roles/IronicConductor.yaml | 2 +- roles/Messaging.yaml | 2 +- roles/Networker.yaml | 2 +- roles/ObjectStorage.yaml | 2 +- roles/README.rst | 2 +- roles_data.yaml | 10 +-- 27 files changed, 81 insertions(+), 132 deletions(-) rename docker/services/{fluentd-client.yaml => fluentd.yaml} (96%) delete mode 100644 environments/services-docker/fluentd-client.yaml create mode 100644 environments/services-docker/fluentd.yaml delete mode 100644 puppet/services/logging/fluentd-base.yaml rename puppet/services/logging/{fluentd-client.yaml => fluentd.yaml} (51%) diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 9533819391..7751798851 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -23,7 +23,7 @@ resource_registry: OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml - OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml + OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. @@ -91,9 +91,7 @@ parameter_defaults: - OS::TripleO::Services::Congress - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - # FIXME(mandre/bandini) mixing BM fluentd and containers is problematic - # https://bugs.launchpad.net/tripleo/+bug/1726891 - #- OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Iscsid diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index aa8cb4de48..9c578add02 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -19,7 +19,7 @@ resource_registry: OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml - OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml + OS::TripleO::Services::Fluentd: ../../puppet/services/logging/fluentd.yaml OS::TripleO::Services::SensuClient: ../../puppet/services/monitoring/sensu-client.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. @@ -87,7 +87,7 @@ parameter_defaults: - OS::TripleO::Services::Congress - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Iscsid diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index 65307de754..9b997c1f40 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -69,7 +69,7 @@ - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd @@ -177,7 +177,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient @@ -217,7 +217,7 @@ - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient @@ -245,7 +245,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp @@ -273,7 +273,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp diff --git a/docker/services/fluentd-client.yaml b/docker/services/fluentd.yaml similarity index 96% rename from docker/services/fluentd-client.yaml rename to docker/services/fluentd.yaml index ac45f6fcfd..96cf115aa5 100644 --- a/docker/services/fluentd-client.yaml +++ b/docker/services/fluentd.yaml @@ -4,7 +4,7 @@ description: > OpenStack containerized fluentd services parameters: - DockerFluentdClientImage: + DockerFluentdImage: description: image type: string DockerFluentdConfigImage: @@ -43,7 +43,7 @@ resources: type: ./containers-common.yaml FluentdClientBase: - type: ../../puppet/services/logging/fluentd-client.yaml + type: ../../puppet/services/logging/fluentd.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} @@ -87,8 +87,8 @@ outputs: recurse: true docker_config: step_3: - fluentd_client: - image: {get_param: DockerFluentdClientImage} + fluentd: + image: {get_param: DockerFluentdImage} net: host privileged: true user: root diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml index ed1297c266..aa30a5a064 100644 --- a/environments/contrail/roles_data_contrail.yaml +++ b/environments/contrail/roles_data_contrail.yaml @@ -102,7 +102,7 @@ - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::PankoApi - OS::TripleO::Services::Zaqar @@ -140,7 +140,7 @@ - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::AuditD - OS::TripleO::Services::Iscsid @@ -158,7 +158,7 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::AuditD - name: ObjectStorage @@ -177,7 +177,7 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::AuditD - name: CephStorage @@ -195,7 +195,7 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::AuditD - name: ContrailController @@ -213,7 +213,7 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - name: ContrailAnalytics @@ -228,7 +228,7 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - name: ContrailAnalyticsDatabase ServicesDefault: @@ -242,7 +242,7 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - name: ContrailTsn ServicesDefault: @@ -256,7 +256,7 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - name: ContrailDpdk ServicesDefault: @@ -270,4 +270,4 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index e77af49ec7..f5afce292e 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -32,7 +32,7 @@ parameter_defaults: - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::AuditD - OS::TripleO::Services::Collectd - OS::TripleO::Services::CephOSD diff --git a/environments/logging-environment.yaml b/environments/logging-environment.yaml index ae8bd7b974..cb948bc488 100644 --- a/environments/logging-environment.yaml +++ b/environments/logging-environment.yaml @@ -2,7 +2,7 @@ ## logging agents resource_registry: - OS::TripleO::Services::FluentdClient: ../puppet/services/logging/fluentd-client.yaml + OS::TripleO::Services::Fluentd: ../puppet/services/logging/fluentd.yaml #parameter_defaults: diff --git a/environments/services-docker/fluentd-client.yaml b/environments/services-docker/fluentd-client.yaml deleted file mode 100644 index 1781a59c3e..0000000000 --- a/environments/services-docker/fluentd-client.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resource_registry: - OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml diff --git a/environments/services-docker/fluentd.yaml b/environments/services-docker/fluentd.yaml new file mode 100644 index 0000000000..8e486e00e1 --- /dev/null +++ b/environments/services-docker/fluentd.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 73462e6b0b..7631e1b689 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -232,7 +232,7 @@ resource_registry: OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None # Services that are disabled by default (use relevant environment files): - OS::TripleO::Services::FluentdClient: OS::Heat::None + OS::TripleO::Services::Fluentd: OS::Heat::None OS::TripleO::Services::Collectd: OS::Heat::None OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml OS::TripleO::Services::ManilaApi: OS::Heat::None diff --git a/puppet/services/logging/fluentd-base.yaml b/puppet/services/logging/fluentd-base.yaml deleted file mode 100644 index 0ab157c7c3..0000000000 --- a/puppet/services/logging/fluentd-base.yaml +++ /dev/null @@ -1,49 +0,0 @@ -heat_template_version: pike - -description: Fluentd base service - -parameters: - 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 - EndpointMap: - default: {} - description: > - Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - - -outputs: - role_data: - description: Role data for the Fluentd role. - value: - service_name: fluentd_base - config_settings: - fluentd::package_name: fluentd - fluentd::service_name: fluentd - fluentd::config_file: /etc/fluentd/fluent.conf - fluentd::config_owner: fluentd - fluentd::config_group: fluentd - fluentd::config_path: /etc/fluentd/config.d - fluentd::plugin_provider: yum - fluentd::service_provider: systemd - fluentd::repo_install: false diff --git a/puppet/services/logging/fluentd-client.yaml b/puppet/services/logging/fluentd.yaml similarity index 51% rename from puppet/services/logging/fluentd-client.yaml rename to puppet/services/logging/fluentd.yaml index 958306f87f..1c5a169990 100644 --- a/puppet/services/logging/fluentd-client.yaml +++ b/puppet/services/logging/fluentd.yaml @@ -32,15 +32,6 @@ parameters: type: json resources: - FluentdBase: - type: ./fluentd-base.yaml - properties: - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} LoggingConfiguration: type: OS::TripleO::LoggingConfiguration @@ -49,32 +40,41 @@ outputs: role_data: description: Role data for the Fluentd client role. value: - service_name: fluentd_client + service_name: fluentd config_settings: - map_merge: - - get_attr: [FluentdBase, role_data, config_settings] - - tripleo::profile::base::logging::fluentd::fluentd_servers: - get_attr: [LoggingConfiguration, LoggingServers] - tripleo::profile::base::logging::fluentd::fluentd_filters: - yaql: - expression: > - $.data.filters.flatten().where($) - data: - filters: - - get_attr: [LoggingConfiguration, LoggingDefaultFilters] - - get_attr: [LoggingConfiguration, LoggingExtraFilters] - tripleo::profile::base::logging::fluentd::fluentd_pos_file_path: - get_attr: [LoggingConfiguration, LoggingPosFilePath] - tripleo::profile::base::logging::fluentd::fluentd_use_ssl: - get_attr: [LoggingConfiguration, LoggingUsesSSL] - tripleo::profile::base::logging::fluentd::fluentd_ssl_certificate: - get_attr: [LoggingConfiguration, LoggingSSLCertificate] - tripleo::profile::base::logging::fluentd::fluentd_ssl_key: - get_attr: [LoggingConfiguration, LoggingSSLKey] - tripleo::profile::base::logging::fluentd::fluentd_ssl_key_passphrase: - get_attr: [LoggingConfiguration, LoggingSSLKeyPassphrase] - tripleo::profile::base::logging::fluentd::fluentd_shared_key: - get_attr: [LoggingConfiguration, LoggingSharedKey] + fluentd::package_name: fluentd + fluentd::service_name: fluentd + fluentd::config_file: /etc/fluentd/fluent.conf + fluentd::config_owner: fluentd + fluentd::config_group: fluentd + fluentd::config_path: /etc/fluentd/config.d + fluentd::plugin_provider: yum + fluentd::service_provider: systemd + fluentd::repo_install: false + tripleo::profile::base::logging::fluentd::fluentd_servers: + get_attr: [LoggingConfiguration, LoggingServers] + tripleo::profile::base::logging::fluentd::fluentd_default_format: + get_attr: [LoggingConfiguration, LoggingDefaultFormat] + tripleo::profile::base::logging::fluentd::fluentd_filters: + yaql: + expression: > + $.data.filters.flatten().where($) + data: + filters: + - get_attr: [LoggingConfiguration, LoggingDefaultFilters] + - get_attr: [LoggingConfiguration, LoggingExtraFilters] + tripleo::profile::base::logging::fluentd::fluentd_pos_file_path: + get_attr: [LoggingConfiguration, LoggingPosFilePath] + tripleo::profile::base::logging::fluentd::fluentd_use_ssl: + get_attr: [LoggingConfiguration, LoggingUsesSSL] + tripleo::profile::base::logging::fluentd::fluentd_ssl_certificate: + get_attr: [LoggingConfiguration, LoggingSSLCertificate] + tripleo::profile::base::logging::fluentd::fluentd_ssl_key: + get_attr: [LoggingConfiguration, LoggingSSLKey] + tripleo::profile::base::logging::fluentd::fluentd_ssl_key_passphrase: + get_attr: [LoggingConfiguration, LoggingSSLKeyPassphrase] + tripleo::profile::base::logging::fluentd::fluentd_shared_key: + get_attr: [LoggingConfiguration, LoggingSharedKey] step_config: | include ::tripleo::profile::base::logging::fluentd upgrade_tasks: diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 9d1bef0807..c7db0ac445 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -16,7 +16,7 @@ - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 8e62e8e7f4..6c03b3b4d1 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -14,7 +14,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp diff --git a/roles/Compute.yaml b/roles/Compute.yaml index d1b61d78c6..8eec93dde2 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -33,7 +33,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 78d23fb4c8..9a217a1c08 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -24,7 +24,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 630cd264ff..6f83813a5b 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -24,7 +24,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index af81000b0d..b1dd1d6dd4 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -24,7 +24,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 90c8fe8c85..8240b66d62 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -58,7 +58,7 @@ - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index b23a0c8102..1ef628ff22 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -43,7 +43,7 @@ - OS::TripleO::Services::Docker - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::Etcd - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd diff --git a/roles/Database.yaml b/roles/Database.yaml index e5c6b4d220..82a64dbc3f 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -14,7 +14,7 @@ - OS::TripleO::Services::Collectd - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 44d98e3d87..550ad9744b 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -11,7 +11,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Kernel diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 5c79374026..1a4c403ed6 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -13,7 +13,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 1f27e163de..7f8a943689 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -14,7 +14,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronDhcpAgent diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index e2eacd9e95..39bb21d9dd 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -22,7 +22,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp diff --git a/roles/README.rst b/roles/README.rst index 5a945af787..ba3495df8b 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -152,7 +152,7 @@ Example * OS::TripleO::Services::ComputeNeutronMetadataAgent * OS::TripleO::Services::ComputeNeutronOvsAgent * OS::TripleO::Services::Docker - * OS::TripleO::Services::FluentdClient + * OS::TripleO::Services::Fluentd * OS::TripleO::Services::Iscsid * OS::TripleO::Services::Kernel * OS::TripleO::Services::MySQLClient diff --git a/roles_data.yaml b/roles_data.yaml index e8979b25b5..3d47ab9a7e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -61,7 +61,7 @@ - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd @@ -183,7 +183,7 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient @@ -225,7 +225,7 @@ - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient @@ -263,7 +263,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp @@ -294,7 +294,7 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Docker - - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Fluentd - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp