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 "Hiera optimization: use a new hiera hook"
[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
48cc4af
..
347a8c1
100644
(file)
--- a/
puppet/services/aodh-api.yaml
+++ b/
puppet/services/aodh-api.yaml
@@
-21,11
+21,6
@@
parameters:
MonitoringSubscriptionAodhApi:
default: 'overcloud-ceilometer-aodh-api'
type: string
MonitoringSubscriptionAodhApi:
default: 'overcloud-ceilometer-aodh-api'
type: string
- EnableCombinationAlarms:
- default: false
- description: Combination alarms are deprecated in Newton, hence disabled
- by default. To enable, set this parameter to true.
- type: boolean
EnableInternalTLS:
type: boolean
default: false
EnableInternalTLS:
type: boolean
default: false
@@
-60,7
+55,7
@@
outputs:
aodh::wsgi::apache::servername:
str_replace:
template:
aodh::wsgi::apache::servername:
str_replace:
template:
- '
"%{::fqdn_$NETWORK}"
'
+ '
%{::fqdn_$NETWORK}
'
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
aodh::api::service_name: 'httpd'
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
aodh::api::service_name: 'httpd'
@@
-73,7
+68,7
@@
outputs:
aodh::api::host:
str_replace:
template:
aodh::api::host:
str_replace:
template:
- '
"%{::fqdn_$NETWORK}"
'
+ '
%{::fqdn_$NETWORK}
'
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the
@@
-83,7
+78,6
@@
outputs:
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
aodh::wsgi::apache::bind_host: {get_param: [ServiceNetMap, AodhApiNetwork]}
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
aodh::wsgi::apache::bind_host: {get_param: [ServiceNetMap, AodhApiNetwork]}
- tripleo::profile::base::aodh::api::enable_combination_alarms: {get_param: EnableCombinationAlarms}
service_config_settings:
get_attr: [AodhBase, role_data, service_config_settings]
step_config: |
service_config_settings:
get_attr: [AodhBase, role_data, service_config_settings]
step_config: |