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 "M/N upgrade sahara-api fails to restart."
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
neutron-l3.yaml
diff --git
a/puppet/services/neutron-l3.yaml
b/puppet/services/neutron-l3.yaml
index
f71bb77
..
9e22337
100644
(file)
--- a/
puppet/services/neutron-l3.yaml
+++ b/
puppet/services/neutron-l3.yaml
@@
-10,6
+10,9
@@
parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-31,6
+34,14
@@
parameters:
- allowed_values:
- legacy
- dvr_snat
- allowed_values:
- legacy
- dvr_snat
+ MonitoringSubscriptionNeutronL3:
+ default: 'overcloud-neutron-l3-agent'
+ type: string
+ NeutronL3AgentLoggingSource:
+ type: json
+ default:
+ tag: openstack.neutron.agent.l3
+ path: /var/log/neutron/l3-agent.log
resources:
resources:
@@
-38,6
+49,7
@@
resources:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs:
@@
-45,6
+57,10
@@
outputs:
description: Role data for the Neutron L3 agent service.
value:
service_name: neutron_l3
description: Role data for the Neutron L3 agent service.
value:
service_name: neutron_l3
+ monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3}
+ logging_source: {get_param: NeutronL3AgentLoggingSource}
+ 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]