Merge "Remove Combination alarms support"

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: |