diff --git a/manifests/init.pp b/manifests/init.pp index 396b93a6..b4c4e27f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -237,8 +237,6 @@ # Defaults to $::os_service_default # # DEPREACTED PARAMETERS -# [*change_password_available*] -# Defaults to undef # [*glance_v1*] # Defaults to false # [*glance_v2*] @@ -391,7 +389,6 @@ class tempest( $load_balancer_global_observer_role = $::os_service_default, $load_balancer_test_with_noop = $::os_service_default, # DEPRECATED PARAMETERS - $change_password_available = undef, $glance_v1 = undef, $glance_v2 = undef, ) { @@ -403,10 +400,6 @@ class tempest( $tempest_roles_real = $::os_service_default } - if $change_password_available != undef { - warning('The change_password_available parameter has been deprecated and has no effect') - } - if $glance_v1 != undef { warning('The glance_v1 parameter has been deprecated and will be removed in a future release.') } @@ -523,8 +516,6 @@ class tempest( 'auth/admin_system': value => $admin_system; 'auth/tempest_roles': value => $tempest_roles_real; 'auth/use_dynamic_credentials': value => $use_dynamic_credentials; - # TODO(tkajinam): Remove this when we remove the change_password_available parameter - 'compute/change_password_available': value => $::os_service_default; 'compute/flavor_ref': value => $flavor_ref; 'compute/flavor_ref_alt': value => $flavor_ref_alt; # TODO(tkajinam): Remove this after Y release. See bug 1958717 diff --git a/releasenotes/notes/remove-change_password_available-d118d68c6c566f5d.yaml b/releasenotes/notes/remove-change_password_available-d118d68c6c566f5d.yaml new file mode 100644 index 00000000..ba92063e --- /dev/null +++ b/releasenotes/notes/remove-change_password_available-d118d68c6c566f5d.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``tempest::change_password_available`` parameter has been removed. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 04b65430..f1cc2cef 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -206,7 +206,6 @@ describe 'tempest' do is_expected.to contain_tempest_config('auth/tempest_roles').with(:value => '') is_expected.to contain_tempest_config('auth/use_dynamic_credentials').with(:value => nil) is_expected.to contain_tempest_config('dns/nameservers').with(:value => nil) - is_expected.to contain_tempest_config('compute/change_password_available').with(:value => '') is_expected.to contain_tempest_config('compute/flavor_ref').with(:value => nil) is_expected.to contain_tempest_config('compute/flavor_ref_alt').with(:value => nil) is_expected.to contain_tempest_config('compute/image_ref').with(:value => nil)