openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove fluentd composable service

Browse Source 
This patch removes fluentd composable service in favor of rsyslog composable service
and modifies *LoggingSource configuration accordingly.

Change-Id: I1e12470b4eea86d8b7a971875d28a2a5e50d5e07
This commit is contained in:
Martin Magr 2019-07-03 11:49:46 +02:00 committed by Sorin Sbarnea
parent bae35832aa
commit 5ccf8951e5
106 changed files with 136 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -138,8 +138,6 @@ and should be executed according to the following table:
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| collectd | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| fluentd | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| sensu-client | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| designate | | | | X | | | | | | | |

7
capabilities-map.yaml
View File

@ -601,10 +601,10 @@ topics:
requires:
- overcloud-resource-registry-puppet.yaml
- title: Centralized logging support
description: Enable centralized logging clients (fluentd)
description: Enable centralized logging clients (rsyslog)
environments:
- file: environments/logging-environment.yaml
title: fluentd client
- file: environments/logging-environment-rsyslog.yaml
title: rsyslog log collector
description:
requires:
- overcloud-resource-registry-puppet.yaml
@ -643,4 +643,3 @@ topics:
description:
requires:
- overcloud-resource-registry-puppet.yaml

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

@ -94,7 +94,6 @@ parameter_defaults:
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::Fluentd
#- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Multipathd

1
ci/environments/scenario002-multinode-containers.yaml
View File

@ -86,7 +86,6 @@ parameter_defaults:
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::PankoApi
- OS::TripleO::Services::Fluentd
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu

3
common/services/role.role.j2.yaml
View File

@ -54,9 +54,6 @@ resources:
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
LoggingConfiguration:
type: OS::TripleO::LoggingConfiguration
ServiceServerMetadataHook:
type: OS::TripleO::{{role.name}}ServiceServerMetadataHook
properties:

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

@ -423,4 +423,3 @@
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::Tuned

8
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.ceilometer.agent.central
path: /var/log/containers/ceilometer/central.log
file: /var/log/containers/ceilometer/central.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -78,10 +78,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_ceilometer_agent_central:
- ceilometer
tripleo_fluentd_sources_ceilometer_agent_central:
- rsyslog:
tripleo_logging_sources_ceilometer_agent_central:
- {get_param: CeilometerAgentCentralLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.ceilometer.agent.ipmi
path: /var/log/containers/ceilometer/ipmi.log
file: /var/log/containers/ceilometer/ipmi.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -86,10 +86,8 @@ outputs:
- ceilometer_redis_password: {get_param: RedisPassword}
ipmi_namespace: true
service_config_settings:
fluentd:
tripleo_fluentd_groups_ceilometer_agent_ipmi:
- ceilometer
tripleo_fluentd_sources_ceilometer_agent_ipmi:
rsyslog:
tripleo_logging_sources_ceilometer_agent_ipmi:
- {get_param: CeilometerAgentIpmiLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.ceilometer.agent.notification
path: /var/log/containers/ceilometer/agent-notification.log
file: /var/log/containers/ceilometer/agent-notification.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -78,10 +78,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_ceilometer_agent_notification:
- ceilometer
tripleo_fluentd_sources_ceilometer_agent_notification:
- rsyslog:
tripleo_logging_sources_ceilometer_agent_notification:
- {get_param: CeilometerAgentNotificationLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.cinder.api
path: /var/log/containers/cinder/cinder-api.log
file: /var/log/containers/cinder/cinder-api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -182,10 +182,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_api:
- cinder
tripleo_fluentd_sources_cinder_api:
- rsyslog:
tripleo_logging_sources_cinder_api:
- {get_param: CinderApiLoggingSource}
keystone:
cinder::keystone::auth::tenant: 'service'

8
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -52,7 +52,7 @@ parameters:
type: json
default:
tag: openstack.cinder.backup
path: /var/log/containers/cinder/cinder-backup.log
file: /var/log/containers/cinder/cinder-backup.log
CinderBackupBackend:
default: swift
description: The short name of the Cinder Backup backend to use.
@ -131,10 +131,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_backup:
- cinder
tripleo_fluentd_sources_cinder_backup:
- rsyslog:
tripleo_logging_sources_cinder_backup:
- {get_param: DockerCinderBackupLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -73,7 +73,7 @@ parameters:
type: json
default:
tag: openstack.cinder.backup
path: /var/log/containers/cinder/cinder-backup.log
file: /var/log/containers/cinder/cinder-backup.log
conditions:
puppet_debug_enabled: {get_param: ConfigDebug}
@ -127,10 +127,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBackupBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_backup:
- cinder
tripleo_fluentd_sources_cinder_backup:
- rsyslog:
tripleo_logging_sources_cinder_backup:
- {get_param: DockerCinderBackupLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.cinder.scheduler
path: /var/log/containers/cinder/cinder-scheduler.log
file: /var/log/containers/cinder/cinder-scheduler.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -76,10 +76,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_scheduler:
- cinder
tripleo_fluentd_sources_cinder_scheduler:
- rsyslog:
tripleo_logging_sources_cinder_scheduler:
- {get_param: CinderSchedulerLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -18,7 +18,7 @@ parameters:
type: json
default:
tag: openstack.cinder.volume
path: /var/log/containers/cinder/cinder-volume.log
file: /var/log/containers/cinder/cinder-volume.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -260,10 +260,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_volume:
- cinder
tripleo_fluentd_sources_cinder_volume:
- rsyslog:
tripleo_logging_sources_cinder_volume:
- {get_param: CinderVolumeLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -61,7 +61,7 @@ parameters:
type: json
default:
tag: openstack.cinder.volume
path: /var/log/containers/cinder/cinder-volume.log
file: /var/log/containers/cinder/cinder-volume.log
conditions:
puppet_debug_enabled: {get_param: ConfigDebug}
@ -114,10 +114,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_cinder_volume:
- cinder
tripleo_fluentd_sources_cinder_volume:
- rsyslog:
tripleo_logging_sources_cinder_volume:
- {get_param: CinderVolumeLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

166
deployment/deprecated/logging/fluentd-config.yaml
View File

@ -1,166 +0,0 @@
heat_template_version: rocky
description: Fluentd logging configuration
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
LoggingDefaultFormat:
description: >
Default format used to parse messages from log files.
type: string
default: >-
/(?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d+)
(?<pid>\d+)
(?<priority>\S+)
(?<message>.*)$/
LoggingPosFilePath:
description: >
Directory in which to place fluentd pos_file files (used to track
file position for the 'tail' input type).
type: string
default: /var/cache/fluentd
LoggingDefaultGroups:
description: >
Make fluentd user a member of these groups. Only override this parameter
if you want to modify the default list of groups. Use
LoggingExtraGroups to add the fluentd user to additional groups.
type: comma_delimited_list
default:
- root
LoggingExtraGroups:
description: >
Make fluentd user a member of these groups (in addition to
LoggingDefaultGroups and the groups provided by individual
composable services).
type: comma_delimited_list
default: []
LoggingServers:
description: |
A list of destinations to which fluentd will forward log messages. Expects
a list of dictionaries of the form:
- host: loghost1.example.com
port: 24224
- host: loghost2.example.com
port: 24224
type: json
default: []
LoggingDefaultFilters:
description: >
A list of fluentd default filters. This will be passed verbatim
to the 'filter' key of a fluentd::config resource. Only override this
if you do not want the default set of filters; use LoggingExtraFilters
if you just want to add additional servers.
type: json
default:
- tag_pattern: '**'
type: record_transformer
record:
host: '${hostname}'
- tag_pattern: 'openstack.**'
type: record_transformer
record:
component: '${tag_parts[1]}'
LoggingExtraFilters:
description: >
A list of additional fluentd filters. This will be passed
verbatim to the 'filter' key of a fluentd::config resource.
type: json
default: []
LoggingUsesSSL:
description: >
A boolean value indicating whether or not we should forward log messages
use the secure_forward plugin.
type: boolean
default: false
LoggingSSLCertificate:
description: >
PEM-encoded SSL CA certificate for fluentd.
type: string
default: ""
LoggingSSLKey:
description: >
PEM-encoded key for fluentd CA certificate (used by in_secure_forward).
type: string
default: ""
LoggingSSLKeyPassphrase:
description: >
Passphrase for LoggingSSLKey (used by in_secure_forward).
type: string
default: ""
LoggingSharedKey:
description: >
Shared secret for fluentd secure-forward plugin.
type: string
default: ""
LoggingDefaultSources:
description: >
A list of default logging sources for fluentd. You should only override
this parameter if you wish to disable the default logging sources. Use
LoggingExtraSources to define additional source configurations.
type: json
default: []
LoggingExtraSources:
description: >
A list of additional logging sources for fluentd. These will be combined
with the LoggingDefaultSources and any logging sources defined by
composable services.
type: json
default: []
outputs:
LoggingDefaultFormat:
value: {get_param: LoggingDefaultFormat}
LoggingDefaultFilters:
value: {get_param: LoggingDefaultFilters}
LoggingExtraFilters:
value: {get_param: LoggingExtraFilters}
LoggingDefaultGroups:
value: {get_param: LoggingDefaultGroups}
LoggingExtraGroups:
value: {get_param: LoggingExtraGroups}
LoggingPosFilePath:
value: {get_param: LoggingPosFilePath}
LoggingSSLCertificate:
value: {get_param: LoggingSSLCertificate}
LoggingSSLKey:
value: {get_param: LoggingSSLKey}
LoggingSSLKeyPassphrase:
value: {get_param: LoggingSSLKeyPassphrase}
LoggingServers:
value: {get_param: LoggingServers}
LoggingSharedKey:
value: {get_param: LoggingSharedKey}
LoggingUsesSSL:
value: {get_param: LoggingUsesSSL}
LoggingDefaultSources:
value: {get_param: LoggingDefaultSources}
LoggingExtraSources:
value: {get_param: LoggingExtraSources}

205
deployment/deprecated/logging/fluentd-container-puppet.yaml
View File

@ -1,205 +0,0 @@
heat_template_version: rocky
description: >
OpenStack containerized fluentd services.
This service is deprecated and will be removed in future releases.
parameters:
ContainerFluentdImage:
description: image
type: string
ContainerFluentdConfigImage:
description: The container image to use fluentd 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
LoggingConfiguration:
type: OS::TripleO::LoggingConfiguration
outputs:
role_data:
description: Role data for the fluentd role.
value:
service_name: fluentd
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
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]
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: fluentd
puppet_tags: config
step_config: |
include ::tripleo::profile::base::logging::fluentd
config_image: {get_param: ContainerFluentdConfigImage}
kolla_config:
/var/lib/kolla/config_files/fluentd.json:
command: /usr/bin/fluentd -c /etc/fluentd/fluent.conf -o /var/log/fluentd/fluentd.log
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
permissions:
- path: /var/lib/fluentd
owner: fluentd:fluentd
recurse: true
- path: /var/log/fluentd
owner: fluentd:fluentd
recurse: true
docker_config:
step_3:
fluentd:
image: {get_param: ContainerFluentdImage}
net: host
privileged: true
user: root
restart: always
security_opt: 'label=disable'
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/cache/containers/fluentd:/var/cache/fluentd:rw,z
- /var/lib/kolla/config_files/fluentd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/fluentd/:/var/lib/kolla/config_files/src:ro
- /var/log/containers:/var/log/containers:ro
- /var/log/containers/fluentd:/var/log/fluentd:rw,z
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
- name: Check if rsyslog exists
shell: systemctl is-active rsyslog
register: rsyslog_config
- when:
- rsyslog_config is changed
- rsyslog_config.rc == 0
block:
- name: Create rsyslog.d/fluentd
blockinfile:
content: |
*.* @127.0.0.1:42185
create: yes
owner: root
group: root
mode: 0644
path: /etc/rsyslog.d/fluentd.conf
seuser: system_u
serole: object_r
setype: syslog_conf_t
selevel: s0
register: logconfig
- name: restart rsyslog service after logging conf change
service:
name: rsyslog
state: restarted
when: logconfig is changed
- name: create persistent directories
file:
path: "{{ item.path }}"
state: directory
setype: "{{ item.setype }}"
with_items:
- { 'path': /var/log/containers/fluentd, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/fluentd, 'setype': svirt_sandbox_file_t }
- name: fluentd logs readme
copy:
dest: /var/log/fluentd/readme.txt
content: |
Log files from fluentd containers can be found under
/var/log/containers/fluentd.
ignore_errors: true
- name: create persistent cache directory
file:
path: /var/cache/containers/fluentd
state: directory
setype: svirt_sandbox_file_t
upgrade_tasks: []
post_upgrade_tasks:
- when: step|int == 1
import_role:
name: tripleo-docker-rm
vars:
containers_to_rm:
- fluentd
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
block:
- name: Check if fluent.service is deployed
command: systemctl is-enabled --quiet fluentd.service
ignore_errors: True
register: fluentd_enabled_result
- name: Set fact fluentd_enabled
set_fact:
fluentd_enabled: "{{ fluentd_enabled_result.rc == 0 }}"
- name: Stop fluentd service
service: name=fluentd.service state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- fluentd_enabled|bool

8
deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.consoleauth
path: /var/log/containers/nova/nova-consoleauth.log
file: /var/log/containers/nova/nova-consoleauth.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -82,10 +82,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [NovaBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_nova_consoleauth:
- nova
tripleo_fluentd_sources_nova_consoleauth:
- rsyslog:
tripleo_logging_sources_nova_consoleauth:
- {get_param: NovaConsoleauthLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

10
deployment/ec2/ec2-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.ec2.api
path: /var/log/containers/ec2api/ec2api.log
file: /var/log/containers/ec2api/ec2api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -197,10 +197,8 @@ outputs:
$NETWORK: {get_param: [ServiceNetMap, Ec2ApiMetadataNetwork]}
- {}
service_config_settings:
fluentd:
tripleo_fluentd_groups_ec2_api:
- nova
tripleo_fluentd_sources_ec2_api:
rsyslog:
tripleo_logging_sources_ec2_api:
- {get_param: Ec2ApiLoggingSource}
keystone:
ec2api::keystone::auth::tenant: 'service'
@ -348,7 +346,7 @@ outputs:
- { 'path': /var/log/containers/ec2_api, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/containers/ec2_api_metadata, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/ec2_api, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/ec2_api_metadata, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/ec2_api_metadata, 'setype': svirt_sandbox_file_t }
- name: ec2_api logs readme
copy:
dest: /var/log/{{ item }}/readme.txt

8
deployment/experimental/designate/designate-producer-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.designate.producer
path: /var/log/containers/designate/designate-producer.log
file: /var/log/containers/designate/designate-producer.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -82,10 +82,8 @@ outputs:
- {}
- designate::producer::workers: {get_param: DesignateWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_designate_producer:
- designate
tripleo_fluentd_sources_designate_producer:
rsyslog:
tripleo_logging_sources_designate_producer:
- {get_param: DesignateProducerLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/experimental/designate/designate-worker-container-puppet.yaml
View File

@ -17,7 +17,7 @@ parameters:
type: json
default:
tag: openstack.designate.worker
path: /var/log/containers/designate/designate-worker.log
file: /var/log/containers/designate/designate-worker.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -135,10 +135,8 @@ outputs:
- {}
- designate::worker::workers: {get_param: DesignateWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_designate_worker:
- designate
tripleo_fluentd_sources_designate_worker:
rsyslog:
tripleo_logging_sources_designate_worker:
- {get_param: DesignateWorkerLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

9
deployment/glance/glance-api-container-puppet.yaml
View File

@ -62,8 +62,7 @@ parameters:
type: json
default:
tag: openstack.glance.api
path: /var/log/containers/glance/api.log
setype: svirt_sandbox_file_t
file: /var/log/containers/glance/api.log
GlanceImageMemberQuota:
default: 128
description: |
@ -425,10 +424,8 @@ outputs:
glance::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
fluentd:
tripleo_fluentd_groups_glance_api:
- glance
tripleo_fluentd_sources_glance_api:
rsyslog:
tripleo_logging_sources_glance_api:
- {get_param: GlanceApiLoggingSource}
# BEGIN DOCKER SETTINGS #
puppet_config:

8
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.gnocchi.api
path: /var/log/containers/gnocchi/app.log
file: /var/log/containers/gnocchi/app.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -199,10 +199,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_gnocchi_api:
- gnocchi
tripleo_fluentd_sources_gnocchi_api:
- rsyslog:
tripleo_logging_sources_gnocchi_api:
- {get_param: GnocchiApiLoggingSource}
keystone:
gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }

6
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -142,10 +142,8 @@ outputs:
- {}
- heat::wsgi::apache_api_cfn::workers: {get_param: HeatWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_heat_api_cfn:
- heat
tripleo_fluentd_sources_heat_api_cfn:
rsyslog:
tripleo_logging_sources_heat_api_cfn:
- {get_param: HeatApiCfnLoggingSource}
keystone:
map_merge:

8
deployment/heat/heat-api-container-puppet.yaml
View File

@ -15,7 +15,7 @@ parameters:
type: json
default:
tag: openstack.heat.api
path: /var/log/containers/heat/heat_api.log
file: /var/log/containers/heat/heat_api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -158,10 +158,8 @@ outputs:
- {}
- heat::wsgi::apache_api::workers: {get_param: HeatWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_heat_api:
- heat
tripleo_fluentd_sources_heat_api:
rsyslog:
tripleo_logging_sources_heat_api:
- {get_param: HeatApiLoggingSource}
keystone:
map_merge:

9
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.heat.engine
path: /var/log/containers/heat/heat-engine.log
file: /var/log/containers/heat/heat-engine.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -184,11 +184,8 @@ outputs:
- {}
- heat::engine::num_engine_workers: {get_param: HeatWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_heat_engine:
- heat
tripleo_fluentd_sources_heat_engine:
rsyslog:
tripleo_logging_sources_heat_engine:
- {get_param: HeatEngineLoggingSource}
mysql:
heat::db::mysql::password: {get_param: HeatPassword}

18
deployment/keystone/keystone-container-puppet.yaml
View File

@ -132,32 +132,32 @@ parameters:
type: json
default:
tag: openstack.keystone
path: /var/log/containers/keystone/keystone.log
file: /var/log/containers/keystone/keystone.log
KeystoneErrorLoggingSource:
type: json
default:
tag: openstack.keystone.error
path: /var/log/containers/httpd/keystone/error_log
file: /var/log/containers/httpd/keystone/error_log
KeystoneAdminAccessLoggingSource:
type: json
default:
tag: openstack.keystone.admin.access
path: /var/log/containers/httpd/keystone/keystone_wsgi_admin_access.log
file: /var/log/containers/httpd/keystone/keystone_wsgi_admin_access.log
KeystoneAdminErrorLoggingSource:
type: json
default:
tag: openstack.keystone.admin.error
path: /var/log/containers/httpd/keystone/keystone_wsgi_admin_error.log
file: /var/log/containers/httpd/keystone/keystone_wsgi_admin_error.log
KeystoneMainAcccessLoggingSource:
type: json
default:
tag: openstack.keystone.main.access
path: /var/log/containers/httpd/keystone/keystone_wsgi_main_access.log
file: /var/log/containers/httpd/keystone/keystone_wsgi_main_access.log
KeystoneMainErrorLoggingSource:
type: json
default:
tag: openstack.keystone.wsgi.main.error
path: /var/log/containers/httpd/keystone/keystone_wsgi_main_error.log
file: /var/log/containers/httpd/keystone/keystone_wsgi_main_error.log
KeystoneCronTokenFlushEnsure:
type: string
description: >
@ -613,10 +613,8 @@ outputs:
- apache::default_vhost: false
- get_attr: [KeystoneLogging, config_settings]
service_config_settings:
fluentd:
tripleo_fluentd_groups_keystone:
- keystone
tripleo_fluentd_sources_keystone:
rsyslog:
tripleo_logging_sources_keystone:
- {get_param: KeystoneLoggingSource}
- {get_param: KeystoneErrorLoggingSource}
- {get_param: KeystoneAdminAccessLoggingSource}

8
deployment/metrics/qdr-container-puppet.yaml
View File

@ -43,7 +43,7 @@ parameters:
type: json
default:
tag: openstack.nova.consoleauth
path: /var/log/containers/qdrouterd/metrics-qdr.log
file: /var/log/containers/qdrouterd/metrics-qdr.log
MetricsQdrPort:
default: '5666'
description: Service name or port number on which the qdrouterd will accept
@ -153,10 +153,8 @@ outputs:
service_name: metrics-qdr
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
service_config_settings:
fluentd:
tripleo_fluentd_groups_metrics_qdr:
- qdr
tripleo_fluentd_sources_metrics_qdr:
rsyslog:
tripleo_logging_sources_metrics_qdr:
- {get_param: MetricsQdrLoggingSource}
config_settings:
map_merge:

8
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.neutron.api
path: /var/log/containers/neutron/server.log
file: /var/log/containers/neutron/server.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -322,10 +322,8 @@ outputs:
neutron::server::default_availability_zones:
{get_param: NeutronDefaultAvailabilityZones}
service_config_settings:
fluentd:
tripleo_fluentd_groups_neutron_api:
- neutron
tripleo_fluentd_sources_neutron_api:
rsyslog:
tripleo_logging_sources_neutron_api:
- {get_param: NeutronApiLoggingSource}
keystone:
neutron::keystone::auth::tenant: 'service'

8
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -46,7 +46,7 @@ parameters:
type: json
default:
tag: openstack.neutron.agent.dhcp
path: /var/log/containers/neutron/dhcp-agent.log
file: /var/log/containers/neutron/dhcp-agent.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -249,10 +249,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_neutron_dhcp:
- neutron
tripleo_fluentd_sources_neutron_dhcp:
- rsyslog:
tripleo_logging_sources_neutron_dhcp:
- {get_param: NeutronDhcpAgentLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

6
deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml
View File

@ -106,10 +106,8 @@ outputs:
- null
service_config_settings:
fluentd:
tripleo_fluentd_groups_neutron_l2gw_agent:
- neutron
tripleo_fluentd_sources_neutron_l2gw_agent:
rsyslog:
tripleo_logging_sources_neutron_l2gw_agent:
- {get_param: NeutronL2gwAgentLoggingSource}
step_config: |
include tripleo::profile::base::neutron::agents::l2gw

8
deployment/neutron/neutron-l3-compute-dvr.yaml
View File

@ -38,7 +38,7 @@ parameters:
type: json
default:
tag: openstack.neutron.agent.l3-compute
path: /var/log/neutron/l3-agent.log
file: /var/log/neutron/l3-agent.log
resources:
@ -64,10 +64,8 @@ outputs:
- get_attr: [NeutronBase, role_data, config_settings]
- neutron::agents::l3::agent_mode : 'dvr'
service_config_settings:
fluentd:
tripleo_fluentd_groups_neutron_l3_compute_dvr:
- neutron
tripleo_fluentd_sources_neutron_l3_compute_dvr:
rsyslog:
tripleo_logging_sources_neutron_l3_compute_dvr:
- {get_param: NeutronL3ComputeAgentLoggingSource}
step_config: |
include tripleo::profile::base::neutron::l3

8
deployment/neutron/neutron-l3-container-puppet.yaml
View File

@ -23,7 +23,7 @@ parameters:
type: json
default:
tag: openstack.neutron.agent.l3
path: /var/log/containers/neutron/l3-agent.log
file: /var/log/containers/neutron/l3-agent.log
NeutronEnableKeepalivedWrapper:
description: Generate a wrapper script so neutron launches keepalived processes in a
separate container.
@ -218,10 +218,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_neutron_l3:
- neutron
tripleo_fluentd_sources_neutron_l3:
- rsyslog:
tripleo_logging_sources_neutron_l3:
- {get_param: NeutronL3AgentLoggingSource}
puppet_config:
puppet_tags: neutron_config,neutron_l3_agent_config

8
deployment/neutron/neutron-metadata-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.neutron.agent.metadata
path: /var/log/containers/neutron/metadata-agent.log
file: /var/log/containers/neutron/metadata-agent.log
ServiceData:
default: {}
description: Dictionary packing service data
@ -145,10 +145,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_neutron_metadata:
- neutron
tripleo_fluentd_sources_neutron_metadata:
- rsyslog:
tripleo_logging_sources_neutron_metadata:
- {get_param: NeutronMetadataAgentLoggingSource}
puppet_config:
puppet_tags: neutron_config,neutron_metadata_agent_config

8
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -18,7 +18,7 @@ parameters:
type: json
default:
tag: openstack.neutron.agent.openvswitch
path: /var/log/containers/neutron/openvswitch-agent.log
file: /var/log/containers/neutron/openvswitch-agent.log
ServiceData:
default: {}
description: Dictionary packing service data
@ -221,10 +221,8 @@ outputs:
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]
- fluentd:
tripleo_fluentd_groups_neutron_ovs_agent:
- neutron
tripleo_fluentd_sources_neutron_ovs_agent:
- rsyslog:
tripleo_logging_sources_neutron_ovs_agent:
- {get_param: NeutronOpenVswitchAgentLoggingSource}
- collectd:
tripleo.collectd.plugins.neutron_ovs_agent:

8
deployment/nova/nova-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.api
path: /var/log/containers/nova/nova-api.log
file: /var/log/containers/nova/nova-api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -212,10 +212,8 @@ outputs:
- {}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_api:
- nova
tripleo_fluentd_sources_nova_api:
rsyslog:
tripleo_logging_sources_nova_api:
- {get_param: NovaApiLoggingSource}
mysql:
map_merge:

8
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -18,7 +18,7 @@ parameters:
type: json
default:
tag: openstack.nova.compute
path: /var/log/containers/nova/nova-compute.log
file: /var/log/containers/nova/nova-compute.log
ServiceData:
default: {}
description: Dictionary packing service data
@ -561,10 +561,8 @@ outputs:
- '1.0'
- {get_attr: [RoleParametersValue, value, 'nova::ram_allocation_ratio']}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_compute:
- nova
tripleo_fluentd_sources_nova_compute:
rsyslog:
tripleo_logging_sources_nova_compute:
- {get_param: NovaComputeLoggingSource}
collectd:
tripleo.collectd.plugins.nova_compute:

8
deployment/nova/nova-conductor-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.conductor
path: /var/log/containers/nova/nova-conductor.log
file: /var/log/containers/nova/nova-conductor.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -115,10 +115,8 @@ outputs:
- {}
- nova::conductor::workers: {get_param: NovaWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_conductor:
- nova
tripleo_fluentd_sources_nova_conductor:
rsyslog:
tripleo_logging_sources_nova_conductor:
- {get_param: NovaConductorLoggingSource}
mysql:
map_merge:

8
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.api.metadata
path: /var/log/containers/nova/nova-api-metadata.log
file: /var/log/containers/nova/nova-api-metadata.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -169,10 +169,8 @@ outputs:
- nova::metadata::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
- {}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_metadata:
- nova
tripleo_fluentd_sources_nova_metadata:
rsyslog:
tripleo_logging_sources_nova_metadata:
- {get_param: NovaMetadataLoggingSource}
keystone:
nova::keystone::auth::tenant: 'service'

8
deployment/nova/nova-scheduler-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.scheduler
path: /var/log/containers/nova/nova-scheduler.log
file: /var/log/containers/nova/nova-scheduler.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -139,10 +139,8 @@ outputs:
- {}
- nova::scheduler::workers: {get_param: NovaSchedulerWorkers}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_scheduler:
- nova
tripleo_fluentd_sources_nova_scheduler:
rsyslog:
tripleo_logging_sources_nova_scheduler:
- {get_param: NovaSchedulerLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/nova/nova-vnc-proxy-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.nova.vncproxy
path: /var/log/containers/nova/nova-vncproxy.log
file: /var/log/containers/nova/nova-vncproxy.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -200,10 +200,8 @@ outputs:
NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
- {}
service_config_settings:
fluentd:
tripleo_fluentd_groups_nova_vnc_proxy:
- nova
tripleo_fluentd_sources_nova_vnc_proxy:
rsyslog:
tripleo_logging_sources_nova_vnc_proxy:
- {get_param: NovaVncproxyLoggingSource}
# BEGIN DOCKER SETTINGS
puppet_config:

8
deployment/octavia/octavia-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.octavia.api
path: /var/log/containers/octavia/api.log
file: /var/log/containers/octavia/api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -170,10 +170,8 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
service_config_settings:
fluentd:
tripleo_fluentd_groups_octavia_api:
- octavia
tripleo_fluentd_sources_octavia_api:
rsyslog:
tripleo_logging_sources_octavia_api:
- {get_param: OctaviaApiLoggingSource}
keystone:
octavia::keystone::auth::tenant: {get_param: OctaviaProjectName}

8
deployment/octavia/octavia-health-manager-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.octavia.health-manager
path: /var/log/containers/octavia/health-manager.log
file: /var/log/containers/octavia/health-manager.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -89,10 +89,8 @@ outputs:
dport: 5555
iniface: {get_param: OctaviaMgmtPortDevName}
service_config_settings:
fluentd:
tripleo_fluentd_groups_octavia_health_manager:
- octavia
tripleo_fluentd_sources_octavia_health_manager:
rsyslog:
tripleo_logging_sources_octavia_health_manager:
- {get_param: OctaviaHealthManagerLoggingSource}
# BEGIN DOCKER SETTINGS #
puppet_config:

8
deployment/octavia/octavia-housekeeping-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.octavia.housekeeping
path: /var/log/containers/octavia/housekeeping.log
file: /var/log/containers/octavia/housekeeping.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -88,10 +88,8 @@ outputs:
- {}
- octavia::housekeeping::amphora_expiry_age: {get_param: OctaviaAmphoraExpiryAge}
service_config_settings:
fluentd:
tripleo_fluentd_groups_octavia_housekeeping:
- octavia
tripleo_fluentd_sources_octavia_housekeeping:
rsyslog:
tripleo_logging_sources_octavia_housekeeping:
- {get_param: OctaviaHousekeepingLoggingSource}
# BEGIN DOCKER SETTINGS #
puppet_config:

8
deployment/octavia/octavia-worker-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.octavia.worker
path: /var/log/containers/octavia/worker.log
file: /var/log/containers/octavia/worker.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -75,10 +75,8 @@ outputs:
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaWorker}
config_settings: {get_attr: [OctaviaBase, role_data, config_settings]}
service_config_settings:
fluentd:
tripleo_fluentd_groups_octavia_worker:
- octavia
tripleo_fluentd_sources_octavia_worker:
rsyslog:
tripleo_logging_sources_octavia_worker:
- {get_param: OctaviaWorkerLoggingSource}
# BEGIN DOCKER SETTINGS #
puppet_config:

14
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -95,12 +95,8 @@ parameters:
type: json
default:
tag: system.pacemaker
path: /var/log/pacemaker.log,/var/log/cluster/corosync.log
format: >-
/^(?<time>[^ ]*\s*[^ ]* [^ ]*)
\[(?<pid>[^ ]*)\]
(?<host>[^ ]*)
(?<message>.*)$/
file: /var/log/pacemaker.log,/var/log/cluster/corosync.log
startmsg.regex: ^[^ ]*\s*[^ ]* [^ ]* \[[^ ]*\] [^ ]*
UpgradeLeappEnabled:
description: Use Leapp for operating system upgrade
type: boolean
@ -153,10 +149,8 @@ outputs:
- {}
- tripleo::pacemaker::tls_priorities: {get_param: PacemakerTLSPriorities}
service_config_settings:
fluentd:
tripleo_fluentd_groups_pacemaker:
- haclient
tripleo_fluentd_sources_pacemaker:
rsyslog:
tripleo_logging_sources_pacemaker:
- {get_param: PacemakerLoggingSource}
step_config: |
include ::tripleo::profile::base::pacemaker

14
deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
View File

@ -81,12 +81,8 @@ parameters:
type: json
default:
tag: system.pacemaker_remote
path: /var/log/pacemaker.log
format: >-
/^(?<time>[^ ]*\s*[^ ]* [^ ]*)
\[(?<pid>[^ ]*)\]
(?<host>[^ ]*)
(?<message>.*)$/
file: /var/log/pacemaker.log
startmsg.regex: ^[^ ]*\s*[^ ]* [^ ]* \[[^ ]*\] [^ ]*
outputs:
role_data:
@ -112,10 +108,8 @@ outputs:
- {get_param: PcsdPassword}
- {get_param: [DefaultPasswords, pcsd_password]}
service_config_settings:
fluentd:
tripleo_fluentd_groups_pacemaker_remote:
- haclient
tripleo_fluentd_sources_pacemaker_remote:
rsyslog:
tripleo_logging_sources_pacemaker_remote:
- {get_param: PacemakerRemoteLoggingSource}
step_config: |
include ::tripleo::profile::base::pacemaker_remote

8
deployment/placement/placement-api-container-puppet.yaml
View File

@ -63,7 +63,7 @@ parameters:
type: json
default:
tag: openstack.placement
path: /var/log/containers/httpd/placement_wsgi_error_ssl.log
file: /var/log/containers/httpd/placement_wsgi_error_ssl.log
NovaPassword:
description: The password for the nova service and db account
type: string
@ -150,10 +150,8 @@ outputs:
- placement::wsgi::apache::workers: {get_param: PlacementWorkers}
service_config_settings:
map_merge:
- fluentd:
tripleo_fluentd_groups_placement:
- placement
tripleo_fluentd_sources_placement:
- rsyslog:
tripleo_logging_sources_placement:
- {get_param: PlacementLoggingSource}
keystone:
placement::keystone::auth::tenant: 'service'

8
deployment/sahara/sahara-api-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.sahara.api
path: /var/log/containers/sahara/sahara-api.log
file: /var/log/containers/sahara/sahara-api.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -111,10 +111,8 @@ outputs:
- 8386
- 13386
service_config_settings:
fluentd:
tripleo_fluentd_groups_sahara_api:
- sahara
tripleo_fluentd_sources_sahara_api:
rsyslog:
tripleo_logging_sources_sahara_api:
- {get_param: SaharaApiLoggingSource}
keystone:
sahara::keystone::auth::tenant: 'service'

8
deployment/sahara/sahara-engine-container-puppet.yaml
View File

@ -14,7 +14,7 @@ parameters:
type: json
default:
tag: openstack.sahara.engine
path: /var/log/containers/sahara/sahara-engine.log
file: /var/log/containers/sahara/sahara-engine.log
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -74,10 +74,8 @@ outputs:
- get_attr: [SaharaBase, role_data, config_settings]
- sahara::sync_db: false
service_config_settings:
fluentd:
tripleo_fluentd_groups_sahara_engine:
- sahara
tripleo_fluentd_sources_sahara_engine:
rsyslog:
tripleo_logging_sources_sahara_engine:
- {get_param: SaharaEngineLoggingSource}
# BEGIN DOCKER SETTINGS #
puppet_config:

3
environments/computealt.yaml
View File

@ -4,9 +4,6 @@ resource_registry:
# OS::TripleO::Services::CollectdAlt: ../deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgentAlt: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::ComputeNeutronOvsAgentAlt: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
OS::TripleO::Services::FluentdAlt: OS::Heat::None
# If enabling fluentd you'll need provide the following in a specific resource_registry
# OS::TripleO::Services::FluentdAlt: ../deployment/deprecated/logging/fluentd-container-puppet.yaml
OS::TripleO::Services::IscsidAlt: ../deployment/iscsid/iscsid-container-puppet.yaml
OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml
OS::TripleO::Services::NovaLibvirtAlt: ../deployment/nova/nova-libvirt-container-puppet.yaml

1
environments/hyperconverged-ceph.yaml
View File

@ -44,7 +44,6 @@ parameter_defaults:
- OS::TripleO::Services::OpenDaylightOvs
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::SkydiveAgent
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::AuditD

2
environments/lifecycle/ffwd-upgrade-prepare.yaml
View File

@ -4,8 +4,6 @@
resource_registry:
OS::TripleO::Services::Core: OS::Heat::None
OS::TripleO::Services::VipHosts: OS::Heat::None
# Deprecated/Name changed services
OS::TripleO::Services::FluentdClient: OS::Heat::None
OS::TripleO::Services::MongoDb: OS::Heat::None
parameter_defaults:

31
environments/logging-environment.yaml
View File

@ -1,31 +0,0 @@
## DEPRECATED
## Fluentd service is deprecated and will be removed in future releases.
## A Heat environment file which can be used to set up
## logging agents
resource_registry:
OS::TripleO::Services::Fluentd: ../deployment/deprecated/logging/fluentd-container-puppet.yaml
#parameter_defaults:
## Simple configuration
#
# LoggingServers:
# - host: log0.example.com
# port: 24224
# - host: log1.example.com
# port: 24224
#
## Example SSL configuration
## (note the use of port 24284 for ssl connections)
#
# LoggingServers:
# - host: 192.168.24.11
# port: 24284
# LoggingUsesSSL: true
# LoggingSharedKey: secret
# LoggingSSLCertificate: |
# -----BEGIN CERTIFICATE-----
# ...certificate data here...
# -----END CERTIFICATE-----

2
environments/services-baremetal/fluentd.yaml
View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml

2
environments/services/fluentd.yaml
View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml

1
environments/undercloud/undercloud-minion.yaml
View File

@ -90,7 +90,6 @@ resource_registry:
OS::TripleO::Services::Ec2Api: OS::Heat::None
OS::TripleO::Services::Etcd: OS::Heat::None
OS::TripleO::Services::ExternalSwiftProxy: OS::Heat::None
OS::TripleO::Services::Fluentd: OS::Heat::None
OS::TripleO::Services::GlanceApi: OS::Heat::None
OS::TripleO::Services::GnocchiApi: OS::Heat::None
OS::TripleO::Services::GnocchiMetricd: OS::Heat::None

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

@ -235,7 +235,6 @@ resource_registry:
# Services that are disabled by default (use relevant environment files):
OS::TripleO::Services::Fluentd: OS::Heat::None
OS::TripleO::Services::IpaClient: OS::Heat::None
OS::TripleO::Services::Ipsec: OS::Heat::None
OS::TripleO::Services::Rhsm: OS::Heat::None
@ -243,7 +242,6 @@ resource_registry:
OS::TripleO::Services::TripleoValidations: OS::Heat::None
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
OS::TripleO::Services::Collectd: OS::Heat::None
OS::TripleO::LoggingConfiguration: deployment/deprecated/logging/fluentd-config.yaml
OS::TripleO::Services::ManilaApi: OS::Heat::None
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
OS::TripleO::Services::ManilaShare: OS::Heat::None

1
roles/BlockStorage.yaml
View File

@ -24,7 +24,6 @@
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/CellController.yaml
View File

@ -33,7 +33,6 @@
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::ContainerImagePrepare
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/CephAll.yaml
View File

@ -27,7 +27,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/CephFile.yaml
View File

@ -23,7 +23,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/CephObject.yaml
View File

@ -23,7 +23,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/CephStorage.yaml
View File

@ -22,7 +22,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/Compute.yaml
View File

@ -46,7 +46,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeAlt.yaml
View File

@ -29,7 +29,6 @@
- OS::TripleO::Services::ComputeNeutronL3Agent
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgentAlt
- OS::TripleO::Services::FluentdAlt
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::IscsidAlt
- OS::TripleO::Services::Kernel

1
roles/ComputeDVR.yaml
View File

@ -33,7 +33,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeHCI.yaml
View File

@ -33,7 +33,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeHCIOvsDpdk.yaml
View File

@ -36,7 +36,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsDpdk
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeInstanceHA.yaml
View File

@ -32,7 +32,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeLiquidio.yaml
View File

@ -33,7 +33,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeLocalEphemeral.yaml
View File

@ -35,7 +35,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeOvsDpdk.yaml
View File

@ -34,7 +34,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsDpdk
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeOvsDpdkRT.yaml
View File

@ -35,7 +35,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsDpdk
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeOvsDpdkSriov.yaml
View File

@ -30,7 +30,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsDpdk
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeOvsDpdkSriovRT.yaml
View File

@ -32,7 +32,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsDpdk
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputePPC64LE.yaml
View File

@ -32,7 +32,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeRBDEphemeral.yaml
View File

@ -35,7 +35,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeRealTime.yaml
View File

@ -39,7 +39,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeSriov.yaml
View File

@ -30,7 +30,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/ComputeSriovRT.yaml
View File

@ -32,7 +32,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/Controller.yaml
View File

@ -85,7 +85,6 @@
- OS::TripleO::Services::Ec2Api
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd

1
roles/ControllerAllNovaStandalone.yaml
View File

@ -57,7 +57,6 @@
- OS::TripleO::Services::DesignateSink
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::GlanceApi

1
roles/ControllerNoCeph.yaml
View File

@ -77,7 +77,6 @@
- OS::TripleO::Services::Ec2Api
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd

1
roles/ControllerNovaStandalone.yaml
View File

@ -61,7 +61,6 @@
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd

1
roles/ControllerOpenstack.yaml
View File

@ -63,7 +63,6 @@
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Ec2Api
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::GlanceApi

2
roles/ControllerStorageNfs.yaml
View File

@ -86,7 +86,6 @@
- OS::TripleO::Services::Ec2Api
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
@ -188,4 +187,3 @@
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::Zaqar

1
roles/Database.yaml
View File

@ -18,7 +18,6 @@
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/DistributedCompute.yaml
View File

@ -32,7 +32,6 @@
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/DistributedComputeHCI.yaml
View File

@ -40,7 +40,6 @@
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/HciCephAll.yaml
View File

@ -40,7 +40,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/HciCephFile.yaml
View File

@ -35,7 +35,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/HciCephMon.yaml
View File

@ -36,7 +36,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/HciCephObject.yaml
View File

@ -35,7 +35,6 @@
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid

1
roles/IronicConductor.yaml
View File

@ -19,7 +19,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::IronicConductor

1
roles/Messaging.yaml
View File

@ -17,7 +17,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/Networker.yaml
View File

@ -21,7 +21,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::IronicNeutronAgent

1
roles/Novacontrol.yaml
View File

@ -18,7 +18,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/ObjectStorage.yaml
View File

@ -30,7 +30,6 @@
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Kernel

1
roles/README.rst
View File

@ -162,7 +162,6 @@ Example
* OS::TripleO::Services::ComputeNeutronMetadataAgent
* OS::TripleO::Services::ComputeNeutronOvsAgent
* OS::TripleO::Services::Docker
* OS::TripleO::Services::Fluentd
* OS::TripleO::Services::Iscsid
* OS::TripleO::Services::Kernel
* OS::TripleO::Services::MySQLClient

Some files were not shown because too many files have changed in this diff Show More