Cleanup deprecated parameters

Change-Id: I7a4010f833da12f7adbdae8cfc343d0fb39b1552

manifests/init.pp

@@ -32,12 +32,6 @@
 #   services. Recommended size is 32768 for PKI keystone tokens.
 #   Defaults to 8192
 #
-## DEPRECATED
-#
-# [*client_package_ensure*]
-#   (Optional) The ensure state for the swift client package.
-#   Defaults to undef
-#
 # == Dependencies
 #
 # None
@@ -55,18 +49,12 @@ class swift(
   $swift_hash_path_prefix = undef,
   $package_ensure         = 'present',
   $max_header_size        = '8192',
-  # DEPRECATED
-  $client_package_ensure  = undef,
 ) {
 
   include swift::deps
   include swift::params
   include swift::client
 
-  if $client_package_ensure {
-    warning('swift::client_package_ensure is deprecated and has no effect')
-  }
-
   if ($swift_hash_path_prefix == undef and $swift_hash_path_suffix == undef) {
     fail('You must specify at least swift_hash_path_prefix or swift_hash_path_suffix')
   }

manifests/proxy/authtoken.pp

@@ -75,28 +75,6 @@
 #  true/false
 #  Defaults to $::os_service_default.
 #
-# == DEPRECATED
-#
-# [*identity_uri*]
-#   (optional) Deprecated. Use auth_url instead.
-#   Defaults to undef
-#
-# [*admin_user*]
-#   (optional) Deprecated. Use username instead.
-#   Defaults to undef
-#
-# [*admin_tenant_name*]
-#   (optional) Deprecated. Use project_name instead.
-#   Defaults to undef
-#
-# [*admin_password*]
-#   (optional) Deprecated. Use password instead.
-#   Defaults to undef
-#
-# [*auth_uri*]
-#   (Optional) Complete public Identity API endpoint.
-#   Defaults to 'http://127.0.0.1:5000'
-#
 # == Authors
 #
 #   Dan Bode dan@puppetlabs.com
@@ -121,42 +99,10 @@ class swift::proxy::authtoken(
   $include_service_catalog      = false,
   $service_token_roles          = $::os_service_default,
   $service_token_roles_required = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $admin_user                   = undef,
-  $admin_tenant_name            = undef,
-  $admin_password               = undef,
-  $identity_uri                 = undef,
-  $auth_uri                     = undef,
 ) inherits swift::params {
 
   include swift::deps
 
-  if $identity_uri {
-    warning('identity_uri is deprecated and will be removed, please use auth_url instead')
-  }
-
-  if $admin_user {
-    warning('admin_user is deprecated and will be removed, please use username instead')
-  }
-
-  if $admin_tenant_name {
-    warning('admin_tenant_name is deprecated and will be removed, please use project_name instead')
-  }
-
-  if $admin_password {
-    warning('admin_password is deprecated and will be removed, please use password instead')
-  }
-
-  if $auth_uri {
-    warning('auth_uri is deprecated, please use www_authenticate_uri')
-  }
-
-  $auth_url_real = pick($identity_uri, $auth_url)
-  $username_real = pick($admin_user, $username)
-  $project_name_real = pick($admin_tenant_name, $project_name)
-  $password_real = pick($admin_password, $password)
-  $www_authenticate_uri_real = pick($auth_uri, $www_authenticate_uri)
-
   if ($::os_package_type != 'debian') {
     file { $signing_dir:
       ensure                  => directory,
@@ -174,14 +120,14 @@ class swift::proxy::authtoken(
     'filter:authtoken/log_name':                     value => 'swift';
     'filter:authtoken/signing_dir':                  value => $signing_dir;
     'filter:authtoken/paste.filter_factory':         value => 'keystonemiddleware.auth_token:filter_factory';
-    'filter:authtoken/www_authenticate_uri':         value => $www_authenticate_uri_real;
+    'filter:authtoken/www_authenticate_uri':         value => $www_authenticate_uri;
-    'filter:authtoken/auth_url':                     value => $auth_url_real;
+    'filter:authtoken/auth_url':                     value => $auth_url;
     'filter:authtoken/auth_plugin':                  value => $auth_plugin;
     'filter:authtoken/project_domain_id':            value => $project_domain_id;
     'filter:authtoken/user_domain_id':               value => $user_domain_id;
-    'filter:authtoken/project_name':                 value => $project_name_real;
+    'filter:authtoken/project_name':                 value => $project_name;
-    'filter:authtoken/username':                     value => $username_real;
+    'filter:authtoken/username':                     value => $username;
-    'filter:authtoken/password':                     value => $password_real;
+    'filter:authtoken/password':                     value => $password;
     'filter:authtoken/region_name':                  value => $region_name;
     'filter:authtoken/delay_auth_decision':          value => $delay_auth_decision;
     'filter:authtoken/cache':                        value => $cache;

manifests/proxy/keystone.pp

@@ -20,10 +20,6 @@
 #    (Optional)
 #    Defaults to Undef.
 #
-# DEPRECATED PARAMETERS
-# [*is_admin*]
-#   Deprecated, this parameter does nothing.
-#
 # == Authors
 #
 #  Dan Bode dan@puppetlabs.com
@@ -33,16 +29,10 @@ class swift::proxy::keystone(
   $operator_roles      = ['admin', 'SwiftOperator'],
   $reseller_prefix     = 'AUTH_',
   $reseller_admin_role = undef,
-  # DEPRECATED PARAMETERS
-  $is_admin            = undef
 ) {
 
   include swift::deps
 
-  if $is_admin {
-        warning('is_admin parameter is deprecated, has no effect and will be removed in a future release.')
-  }
-
   swift_proxy_config {
     'filter:keystone/use':                 value => 'egg:swift#keystoneauth';
     'filter:keystone/operator_roles':      value => join(any2array($operator_roles), ', ');

releasenotes/notes/releasenotes/notes/cleanup-deprecated-params-victoria-8783e8274f9c12a7.yaml

@@ -0,0 +1,17 @@
+---
+deprecations:
+  - |
+    The following deprecated parameters were removed fron
+    ``swift::proxy::authtoken`` class.
+
+    - ``identity_uri``
+    - ``admin_user``
+    - ``admin_tenant_name``
+    - ``admin_password``
+    - ``auth_uri``
+
+  - |
+    The ``swift::proxy::keystone::is_admin`` parameter was removed.
+
+  - |
+    The ``swift::client_package_ensure`` parameter was removed.

spec/acceptance/basic_swift_spec.rb

@@ -233,7 +233,7 @@ describe 'basic swift' do
         service_provider   => 'swiftinit',
       }
       class { 'swift::proxy::authtoken':
-        admin_password => 'a_big_secret',
+        password => 'a_big_secret',
       }
       class { 'swift::keystone::dispersion': } -> class { 'swift::dispersion': }
       class {'::swift::objectexpirer':

spec/classes/swift_proxy_authtoken_spec.rb

@@ -40,9 +40,9 @@ describe 'swift::proxy::authtoken' do
     describe "when overriding parameters" do
       let :params do
         {
-          :admin_tenant_name            => 'admin',
+          :project_name                 => 'admin',
-          :admin_user                   => 'swiftuser',
+          :username                     => 'swiftuser',
-          :admin_password               => 'swiftpassword',
+          :password                    => 'swiftpassword',
           :region_name                  => 'region2',
           :cache                        => 'foo',
           :delay_auth_decision          => '0',
@@ -79,21 +79,21 @@ describe 'swift::proxy::authtoken' do
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('http://public.host/keystone/main') }
     end
 
-    describe "when identity_uri is set" do
+    describe "when auth_url is set" do
       let :params do
         {
-          :identity_uri => 'https://foo.bar:5000/'
+          :auth_url => 'https://foo.bar:5000/'
         }
       end
 
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:5000/') }
     end
 
-    describe "when both www_authenticate_uri and identity_uri are set" do
+    describe "when both www_authenticate_uri and auth_url are set" do
       let :params do
         {
           :www_authenticate_uri => 'https://foo.bar:5000/v3/',
-          :identity_uri         => 'https://foo.bar:5000/'
+          :auth_url             => 'https://foo.bar:5000/'
         }
       end