Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add option to specify Certmonger CA"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
neutron-l3-compute-dvr.yaml
diff --git
a/puppet/services/neutron-l3-compute-dvr.yaml
b/puppet/services/neutron-l3-compute-dvr.yaml
index
0f3c2a7
..
b6c2911
100644
(file)
--- a/
puppet/services/neutron-l3-compute-dvr.yaml
+++ b/
puppet/services/neutron-l3-compute-dvr.yaml
@@
-26,6
+26,14
@@
parameters:
description: Name of bridge used for external network traffic.
type: string
default: 'br-ex'
description: Name of bridge used for external network traffic.
type: string
default: 'br-ex'
+ 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
resources:
resources:
@@
-41,6
+49,10
@@
outputs:
description: Role data for DVR L3 Agent on Compute Nodes
value:
service_name: neutron_l3_compute_dvr
description: Role data for DVR L3 Agent on Compute Nodes
value:
service_name: neutron_l3_compute_dvr
+ monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3Dvr}
+ logging_source: {get_param: NeutronL3ComputeAgentLoggingSource}
+ logging_groups:
+ - neutron
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]