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 "Pass cinder_iscsi_address without brackets"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
aodh-api.yaml
diff --git
a/puppet/services/aodh-api.yaml
b/puppet/services/aodh-api.yaml
index
4308052
..
cc1f4b0
100644
(file)
--- a/
puppet/services/aodh-api.yaml
+++ b/
puppet/services/aodh-api.yaml
@@
-27,6
+27,13
@@
resources:
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
+ ApacheServiceBase:
+ type: ./apache.yaml
+ properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ EndpointMap: {get_param: EndpointMap}
+
outputs:
role_data:
description: Role data for the Aodh API service.
outputs:
role_data:
description: Role data for the Aodh API service.
@@
-35,6
+42,7
@@
outputs:
config_settings:
map_merge:
- get_attr: [AodhBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [AodhBase, role_data, config_settings]
+ - get_attr: [ApacheServiceBase, role_data, config_settings]
- aodh::wsgi::apache::ssl: false
aodh::api::service_name: 'httpd'
tripleo.aodh_api.firewall_rules:
- aodh::wsgi::apache::ssl: false
aodh::api::service_name: 'httpd'
tripleo.aodh_api.firewall_rules: