openstack/tripleo-heat-templates
Code Issues Proposed changes

logging: merge fluentd-client and fluentd-base

Browse Source 
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
This commit is contained in:
Lars Kellogg-Stedman 2017-08-24 21:22:57 -07:00 committed by Juan Badia Payno
parent 49341d6a9a
commit f982eb55c4
27 changed files with 81 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/environments/scenario001-multinode-containers.yaml
View File

@ -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

4
ci/environments/scenario001-multinode.yaml
View File

@ -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

10
deployed-server/deployed-server-roles-data.yaml
View File

@ -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

8
docker/services/fluentd-client.yaml → docker/services/fluentd.yaml
View File

@ -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

20
environments/contrail/roles_data_contrail.yaml
View File

@ -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

2
environments/hyperconverged-ceph.yaml
View File

@ -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

2
environments/logging-environment.yaml
View File

@ -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:

2
environments/services-docker/fluentd-client.yaml
View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml

2
environments/services-docker/fluentd.yaml Normal file
View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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

49
puppet/services/logging/fluentd-base.yaml
View File

@ -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

26
puppet/services/logging/fluentd-client.yaml → puppet/services/logging/fluentd.yaml
View File

@ -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,12 +40,21 @@ 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:
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: >

2
roles/BlockStorage.yaml
View File

@ -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

2
roles/CephStorage.yaml
View File

@ -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

2
roles/Compute.yaml
View File

@ -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

2
roles/ComputeHCI.yaml
View File

@ -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

2
roles/ComputeOvsDpdk.yaml
View File

@ -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

2
roles/ComputeSriov.yaml
View File

@ -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

2
roles/Controller.yaml
View File

@ -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

2
roles/ControllerOpenstack.yaml
View File

@ -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

2
roles/Database.yaml
View File

@ -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

2
roles/IronicConductor.yaml
View File

@ -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

2
roles/Messaging.yaml
View File

@ -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

2
roles/Networker.yaml
View File

@ -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

2
roles/ObjectStorage.yaml
View File

@ -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

2
roles/README.rst
View File

@ -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

10
roles_data.yaml
View File

@ -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