summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-23 15:57:20 +0000
committerGerrit Code Review <review@openstack.org>2016-11-23 15:57:20 +0000
commit42405fae723a7e7d901ea222279efdf98d866657 (patch)
treeaf761eb7e31e6a2da0130319c18db3795db08334
parent145961271715bc16e65072a5092ddba54694efa5 (diff)
parentea22134c72e8e919120e9daadca6cd43035f3fa2 (diff)
Merge "Remove Combination alarms support"
-rw-r--r--puppet/services/aodh-api.yaml6
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index 48cc4af6..daed1665 100644
--- 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
- 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
@@ -83,7 +78,6 @@ outputs:
# 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: |