summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-11-16 16:09:48 -0500
committerPradeep Kilambi <pkilambi@redhat.com>2016-11-16 16:09:48 -0500
commitea22134c72e8e919120e9daadca6cd43035f3fa2 (patch)
tree97d704433a98edd4a685caf2ef3f067d63b4fb61 /puppet/services
parente171ef1b684ee8dcc13b30586f11f5ccb54eba98 (diff)
Remove Combination alarms support
combination alarms are completely removed in Ocata. Remove this from tripleo. Change-Id: Iec2e26ebdaa108ddbb2cf45fc4b6c68023fb6ce0
Diffstat (limited to 'puppet/services')
-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: |