b20bce1bf0
The initial fluentd client implementation predates the introduction of service_config_settings, and necessitated some invasive changes to what is now common/serivces.yaml. This commit modifies existing services to use the service_config_settings based configuration mechanism supported by more recent versions of the fluentd support in puppet-tripleo. Partial-bug: #1715187 Depends-On: I3149902401d68d6fd236073a73a20f982d4b952a Depends-On: I2b057190ec0e4e75ee4ee47ebe0164c2644e5ab7 Depends-On: Ie7df4b8b94cb0ae38096ab95800f211ef1cd8455 Change-Id: I28028ffa00df2da8e0478a551d3de89c3ee46e1f
74 lines
2.2 KiB
YAML
74 lines
2.2 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Sahara Engine service configured with Puppet
|
|
|
|
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
|
|
MonitoringSubscriptionSaharaEngine:
|
|
default: 'overcloud-sahara-engine'
|
|
type: string
|
|
SaharaEngineLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.sahara.engine
|
|
path: /var/log/sahara/sahara-engine.log
|
|
|
|
resources:
|
|
SaharaBase:
|
|
type: ./sahara-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Sahara Engine role.
|
|
value:
|
|
service_name: sahara_engine
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [SaharaBase, role_data, config_settings]
|
|
service_config_settings:
|
|
fluentd:
|
|
tripleo_fluentd_groups_sahara_engine:
|
|
- sahara
|
|
tripleo_fluentd_sources_sahara_engine:
|
|
- {get_param: SaharaEngineLoggingSource}
|
|
step_config: |
|
|
include ::tripleo::profile::base::sahara::engine
|
|
upgrade_tasks:
|
|
- name: Stop sahara_engine service
|
|
when: step|int == 1
|
|
service: name=openstack-sahara-engine state=stopped
|