diff --git a/manifests/api.pp b/manifests/api.pp index 479972378..5af342f39 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -211,10 +211,6 @@ # (optional) DEPRECATED. The keystone url where nova should send requests for ec2tokens # Defaults to undef # -# [*volume_api_class*] -# (optional) DEPRECATED. The name of the class that nova will use to access volumes. Cinder is the only option. -# Defaults to undef -# # [*ec2_listen_port*] # (optional) DEPRECATED. The port on which the EC2 API will listen. # Defaults to port undef @@ -311,7 +307,6 @@ class nova::api( $ec2_workers = undef, $keystone_ec2_url = undef, $auth_version = undef, - $volume_api_class = undef, $osapi_v3 = undef, $admin_password = undef, $auth_uri = undef, @@ -334,10 +329,6 @@ class nova::api( warning('osapi_v3 is deprecated, has no effect and will be removed in a future release.') } - if $volume_api_class { - warning('volume_api_class parameter is deprecated, has no effect and will be removed in a future release.') - } - if $ec2_listen_port or $ec2_workers or $keystone_ec2_url { warning('ec2_listen_port, ec2_workers and keystone_ec2_url are deprecated and have no effect. Deploy openstack/ec2-api instead.') } diff --git a/releasenotes/notes/remove_deprecated_volume_api_class_option-671a562e918fd571.yaml b/releasenotes/notes/remove_deprecated_volume_api_class_option-671a562e918fd571.yaml new file mode 100644 index 000000000..76298046c --- /dev/null +++ b/releasenotes/notes/remove_deprecated_volume_api_class_option-671a562e918fd571.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - The deprecated ``volume_api_class`` config option has been + removed. diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb index ce83fa175..f2e0d1a21 100644 --- a/spec/classes/nova_api_spec.rb +++ b/spec/classes/nova_api_spec.rb @@ -103,7 +103,6 @@ describe 'nova::api' do :metadata_listen => '127.0.0.1', :metadata_listen_port => 8875, :osapi_compute_listen_port => 8874, - :volume_api_class => 'nova.volume.cinder.API', :use_forwarded_for => false, :ratelimits => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)', :neutron_metadata_proxy_shared_secret => 'secrete', @@ -204,11 +203,11 @@ describe 'nova::api' do }) end it { is_expected.to contain_exec('execute nova-api validation').with( - :path => '/usr/bin:/bin:/usr/sbin:/sbin', - :provider => 'shell', - :tries => '10', - :try_sleep => '2', - :command => 'nova --os-auth-url http://127.0.0.1:5000/ --os-project-name services --os-username nova --os-password passw0rd flavor-list', + :path => '/usr/bin:/bin:/usr/sbin:/sbin', + :provider => 'shell', + :tries => '10', + :try_sleep => '2', + :command => 'nova --os-auth-url http://127.0.0.1:5000/ --os-project-name services --os-username nova --os-password passw0rd flavor-list', )} it { is_expected.to contain_anchor('create nova-api anchor').with( @@ -224,11 +223,11 @@ describe 'nova::api' do }) end it { is_expected.to contain_exec('execute nova-api validation').with( - :path => '/usr/bin:/bin:/usr/sbin:/sbin', - :provider => 'shell', - :tries => '10', - :try_sleep => '2', - :command => 'my-script', + :path => '/usr/bin:/bin:/usr/sbin:/sbin', + :provider => 'shell', + :tries => '10', + :try_sleep => '2', + :command => 'my-script', )} it { is_expected.to contain_anchor('create nova-api anchor').with( @@ -239,8 +238,8 @@ describe 'nova::api' do context 'while not managing service state' do before do params.merge!({ - :enabled => false, - :manage_service => false, + :enabled => false, + :manage_service => false, }) end @@ -301,10 +300,10 @@ describe 'nova::api' do it 'enable nova API service' do is_expected.to contain_service('nova-api').with( - :ensure => 'running', - :name => platform_params[:nova_api_service], - :enable => true, - :tag => 'nova-service', + :ensure => 'running', + :name => platform_params[:nova_api_service], + :enable => true, + :tag => 'nova-service', ) end it 'enable metadata in evenlet configuration' do @@ -326,10 +325,10 @@ describe 'nova::api' do it 'disable nova API service' do is_expected.to contain_service('nova-api').with( - :ensure => 'stopped', - :name => platform_params[:nova_api_service], - :enable => false, - :tag => 'nova-service', + :ensure => 'stopped', + :name => platform_params[:nova_api_service], + :enable => false, + :tag => 'nova-service', ) end end