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 "Remove hard-coded roles in EnabledServices output"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
neutron-dhcp.yaml
diff --git
a/puppet/services/neutron-dhcp.yaml
b/puppet/services/neutron-dhcp.yaml
index
b2ad5da
..
2cd08f9
100644
(file)
--- a/
puppet/services/neutron-dhcp.yaml
+++ b/
puppet/services/neutron-dhcp.yaml
@@
-34,6
+34,11
@@
parameters:
MonitoringSubscriptionNeutronDhcp:
default: 'overcloud-neutron-dhcp'
type: string
MonitoringSubscriptionNeutronDhcp:
default: 'overcloud-neutron-dhcp'
type: string
+ NeutronDhcpAgentLoggingSource:
+ type: json
+ default:
+ tag: openstack.neutron.agent.dhcp
+ path: /var/log/neutron/dhcp-agent.log
resources:
resources:
@@
-50,6
+55,9
@@
outputs:
value:
service_name: neutron_dhcp
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronDhcp}
value:
service_name: neutron_dhcp
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronDhcp}
+ logging_source: {get_param: NeutronDhcpAgentLoggingSource}
+ 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]