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
95 lines
3.0 KiB
YAML
95 lines
3.0 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Neutron L3 agent for DVR enabled compute nodes
|
|
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
|
|
Debug:
|
|
type: boolean
|
|
default: false
|
|
description: Set to True to enable debugging on all services.
|
|
MonitoringSubscriptionNeutronL3Dvr:
|
|
default: 'overcloud-neutron-l3-dvr'
|
|
type: string
|
|
NeutronL3ComputeAgentLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.neutron.agent.l3-compute
|
|
path: /var/log/neutron/l3-agent.log
|
|
|
|
# DEPRECATED: the following options are deprecated and are currently maintained
|
|
# for backwards compatibility. They will be removed in the Pike cycle.
|
|
NeutronExternalNetworkBridge:
|
|
description: Name of bridge used for external network traffic. Usually L2
|
|
agent handles port wiring into external bridge, and hence the
|
|
parameter should be unset.
|
|
type: string
|
|
default: ''
|
|
|
|
conditions:
|
|
|
|
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
|
|
|
resources:
|
|
|
|
NeutronBase:
|
|
type: ./neutron-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 DVR L3 Agent on Compute Nodes
|
|
value:
|
|
service_name: neutron_l3_compute_dvr
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3Dvr}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NeutronBase, role_data, config_settings]
|
|
- neutron::agents::l3::agent_mode : 'dvr'
|
|
-
|
|
if:
|
|
- external_network_bridge_empty
|
|
- {}
|
|
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
|
service_config_settings:
|
|
fluentd:
|
|
tripleo_fluentd_groups_neutron_l3_compute_dvr:
|
|
- neutron
|
|
tripleo_fluentd_sources_neutron_l3_compute_dvr:
|
|
- {get_param: NeutronL3ComputeAgentLoggingSource}
|
|
step_config: |
|
|
include tripleo::profile::base::neutron::l3
|