Remove deprecated parameters

Remove parameters that has been deprecated
for atleast one cycle.

Change-Id: I887d86893e90cebf5bc28dd539e42436f9a31c6a

manifests/api.pp

@@ -48,16 +48,6 @@
 #   (optional) Gnocchi external project owner (usually Ceilometer project name)
 #   Defaults to 'services'
 #
-# DEPRECATED PARAMETERS
-#
-# [*host*]
-#   (optional) The aodh api bind address.
-#   Defaults to undef
-#
-# [*port*]
-#   (optional) The aodh api port.
-#   Defaults to undef
-#
 class aodh::api (
   $manage_service                 = true,
   $enabled                        = true,
@@ -69,9 +59,6 @@ class aodh::api (
   $max_request_body_size          = $::os_service_default,
   $paste_config                   = $::os_service_default,
   $gnocchi_external_project_owner = 'services',
-  # DEPRECATED PARAMETERS
-  $host                           = undef,
-  $port                           = undef,
 ) inherits aodh::params {
 
 
@@ -83,15 +70,6 @@ class aodh::api (
     include ::aodh::keystone::authtoken
   }
 
-  if $host {
-    warning('host has no effect as of Newton and will be removed in a future \
-release. aodh::wsgi::apache supports setting a host via bind_host.')
-  }
-  if $port {
-    warning('port has no effect as of Newton and will be removed in a future \
-release. aodh::wsgi::apache supports setting a port.')
-  }
-
   package { 'aodh-api':
     ensure => $package_ensure,
     name   => $::aodh::params::api_package_name,

manifests/auth.pp

@@ -47,13 +47,6 @@
 #    communication with OpenStack services.
 #    Optional. Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-#  [*auth_endpoint_type*]
-#    Type of endpoint in Identity service catalog to use for
-#    communication with OpenStack services.
-#    Optional. Defaults to $::os_service_default.
-#
 class aodh::auth (
   $auth_password,
   $auth_url           = 'http://localhost:5000/v3',
@@ -66,17 +59,10 @@ class aodh::auth (
   $auth_tenant_id     = $::os_service_default,
   $auth_cacert        = $::os_service_default,
   $interface          = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $auth_endpoint_type = undef,
 ) {
 
   include ::aodh::deps
 
-  if $auth_endpoint_type {
-    warning('The auth_endpoint_type parameter is deprecated. Please use interface instead.')
-  }
-  $interface_real = pick($auth_endpoint_type, $interface)
-
   aodh_config {
     'service_credentials/auth_url'          : value => $auth_url;
     'service_credentials/region_name'       : value => $auth_region;
@@ -85,7 +71,7 @@ class aodh::auth (
     'service_credentials/project_name'      : value => $auth_tenant_name;
     'service_credentials/cacert'            : value => $auth_cacert;
     'service_credentials/tenant_id'         : value => $auth_tenant_id;
-    'service_credentials/interface'         : value => $interface_real;
+    'service_credentials/interface'         : value => $interface;
     'service_credentials/project_domain_id' : value => $project_domain_id;
     'service_credentials/user_domain_id'    : value => $user_domain_id;
     'service_credentials/auth_type'         : value => $auth_type;

manifests/init.pp

@@ -207,12 +207,6 @@
 #   in the aodh config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*gnocchi_url*]
-#   (optional) URL to Gnocchi.
-#   Defaults to undef.
-#
 class aodh (
   $package_ensure                     = 'present',
   $alarm_history_time_to_live         = $::os_service_default,
@@ -259,17 +253,11 @@ class aodh (
   $database_retry_interval            = undef,
   $database_max_overflow              = undef,
   $purge_config                       = false,
-  # DEPRECATED PARAMETERS
-  $gnocchi_url                        = undef,
 ) inherits aodh::params {
 
   include ::aodh::deps
   include ::aodh::db
 
-  if $gnocchi_url {
-    warning('gnocchi_url has no effect as of Newton and will be removed in a future release')
-  }
-
   package { 'aodh':
     ensure => $package_ensure,
     name   => $::aodh::params::common_package_name,

manifests/params.pp

@@ -17,10 +17,6 @@ class aodh::params {
       $evaluator_package_name  = 'openstack-aodh-evaluator'
       $evaluator_service_name  = 'openstack-aodh-evaluator'
       $expirer_package_name    = 'openstack-aodh-expirer'
-
-      # Deprecated in N, replaced with expirer_service_name
-      $expirer_package_serice  = 'openstack-aodh-expirer'
-
       $expirer_service_name    = 'openstack-aodh-expirer'
       $listener_package_name   = 'openstack-aodh-listener'
       $listener_service_name   = 'openstack-aodh-listener'
@@ -37,10 +33,6 @@ class aodh::params {
       $evaluator_package_name  = 'aodh-evaluator'
       $evaluator_service_name  = 'aodh-evaluator'
       $expirer_package_name    = 'aodh-expirer'
-
-      # Deprecated in N, replaced with expirer_service_name
-      $expirer_package_serice  = 'aodh-expirer'
-
       $expirer_service_name    = 'aodh-expirer'
       $listener_package_name   = 'aodh-listener'
       $listener_service_name   = 'aodh-listener'

releasenotes/notes/remove-deprecated-f7d4f916bd4c6298.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The deprecated parameters heat::api::host and heat::api::port is removed.
+  - |
+    The deprecated parameter auth_endpoint_type in heat::auth is removed.
+    Please use interface parameter instead.
+  - |
+    The deprecated parameter heat::gnocchi_url is removed.

spec/classes/aodh_api_spec.rb

@@ -17,7 +17,7 @@ describe 'aodh::api' do
     }
   end
 
-  shared_examples_for 'aodh-api' do
+  shared_examples 'aodh::api' do
 
     it { is_expected.to contain_class('aodh::deps') }
     it { is_expected.to contain_class('aodh::params') }
@@ -166,7 +166,7 @@ describe 'aodh::api' do
   end
 
   on_supported_os({
-    :supported_os   => OSDefaults.get_supported_os
+    :supported_os => OSDefaults.get_supported_os
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
@@ -186,7 +186,8 @@ describe 'aodh::api' do
             :api_service_name => 'openstack-aodh-api' }
         end
       end
-      it_configures 'aodh-api'
+
+      it_behaves_like 'aodh::api'
     end
   end