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 double tcp_listen_options entries for rabbit"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
sahara-engine.yaml
diff --git
a/puppet/services/sahara-engine.yaml
b/puppet/services/sahara-engine.yaml
index
bcc93cb
..
287c1c0
100644
(file)
--- a/
puppet/services/sahara-engine.yaml
+++ b/
puppet/services/sahara-engine.yaml
@@
-10,17
+10,29
@@
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
via parameter_defaults in the resource registry.
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:
ServiceNetMap: {get_param: ServiceNetMap}
resources:
SaharaBase:
type: ./sahara-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs:
@@
-28,6
+40,10
@@
outputs:
description: Role data for the Sahara Engine role.
value:
service_name: sahara_engine
description: Role data for the Sahara Engine role.
value:
service_name: sahara_engine
+ monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
+ logging_source: {get_param: SaharaEngineLoggingSource}
+ logging_groups:
+ - sahara
config_settings:
map_merge:
- get_attr: [SaharaBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [SaharaBase, role_data, config_settings]