From 17b3724ec83ae1e6f66ca9d35061a247c82f8eeb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 19 Apr 2024 02:16:09 +0900 Subject: [PATCH] Remove deprecated api class parameters These parameters were deprecated during the previous cycle and have had no effect. Change-Id: I3c1ef0de244d6a40ed2af89615748abdbaf3fdfe --- manifests/api.pp | 48 ------------------- ...d-api-opts-dalmetian-4d12162ebca98f9b.yaml | 10 ++++ spec/classes/nova_api_spec.rb | 3 -- 3 files changed, 10 insertions(+), 51 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-api-opts-dalmetian-4d12162ebca98f9b.yaml diff --git a/manifests/api.pp b/manifests/api.pp index 1fca898ee..1ae971f9b 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -133,28 +133,6 @@ # the up cells. # Defaults to $facts['os_service_default'] # -# DEPRECATED -# -# [*nova_metadata_wsgi_enabled*] -# Wether nova metadata api is run via wsgi. Since running metadata via eventlet is -# going to be removed in the Sein release we can deprecate this and plan to remove -# metadata handling from api class. -# Defaults to false -# -# [*hide_server_address_states*] -# (optional) This option is a list of all instance states for which network address -# information should not be returned from the API. -# Defaults to undef -# -# [*allow_instance_snapshots*] -# (optional) Operators can turn off the ability for a user to take snapshots of their -# instances by setting this option to False -# Defaults to undef -# -# [*enable_network_quota*] -# (optional) This option is used to enable or disable quota checking for tenant networks -# Defaults to undef -# class nova::api( Boolean $enabled = true, Boolean $manage_service = true, @@ -184,11 +162,6 @@ class nova::api( $instance_list_cells_batch_strategy = $facts['os_service_default'], $instance_list_cells_batch_fixed_size = $facts['os_service_default'], $list_records_by_skipping_down_cells = $facts['os_service_default'], - # DEPRECATED PARAMETER - $nova_metadata_wsgi_enabled = undef, - $hide_server_address_states = undef, - $allow_instance_snapshots = undef, - $enable_network_quota = undef, ) inherits nova::params { include nova::deps @@ -198,20 +171,6 @@ class nova::api( include nova::availability_zone include nova::pci - if $nova_metadata_wsgi_enabled != undef { - warning('The nova_metadata_wsgi_enabled parameter has been deprecated and has no effect') - } - - [ - 'hide_server_address_states', - 'allow_instance_snapshots', - 'enable_network_quota' - ].each |String $opt| { - if getvar($opt) != undef { - warning("The ${opt} parameter has been deprecated and has no effect.") - } - } - # sanitize service_name and prepare DEFAULT/enabled_apis parameter if $service_name == $::nova::params::api_service_name { nova_config { @@ -311,13 +270,6 @@ as a standalone service, or httpd for being run by a httpd server") 'api/list_records_by_skipping_down_cells': value => $list_records_by_skipping_down_cells; } - # TODO(tkajinam): Remove this after 2024.1 release - nova_config { - 'api/hide_server_address_states': ensure => absent; - 'api/allow_instance_snapshots': ensure => absent; - 'DEFAULT/enable_network_quota': ensure => absent; - } - # Added arg and if statement prevents this from being run # where db is not active i.e. the compute if $sync_db { diff --git a/releasenotes/notes/remove-deprecated-api-opts-dalmetian-4d12162ebca98f9b.yaml b/releasenotes/notes/remove-deprecated-api-opts-dalmetian-4d12162ebca98f9b.yaml new file mode 100644 index 000000000..26201be34 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-api-opts-dalmetian-4d12162ebca98f9b.yaml @@ -0,0 +1,10 @@ +--- +features: + - | + The following ``nova::api`` class parameters have been removed. These were + all deprecated and have had no effect. + + - ``nova_metadata_wsgi_enabled`` + - ``hide_server_address_states`` + - ``allow_instance_snapshots`` + - ``enable_network_quota`` diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb index 086c18206..9e1ccfcfe 100644 --- a/spec/classes/nova_api_spec.rb +++ b/spec/classes/nova_api_spec.rb @@ -59,9 +59,6 @@ describe 'nova::api' do is_expected.to contain_nova_config('api/max_limit').with_value('') is_expected.to contain_nova_config('api/compute_link_prefix').with_value('') is_expected.to contain_nova_config('api/glance_link_prefix').with_value('') - is_expected.to contain_nova_config('api/hide_server_address_states').with_ensure('absent') - is_expected.to contain_nova_config('api/allow_instance_snapshots').with_ensure('absent') - is_expected.to contain_nova_config('DEFAULT/enable_network_quota').with_ensure('absent') is_expected.to contain_nova_config('api/enable_instance_password').with_value('') is_expected.to contain_nova_config('DEFAULT/password_length').with_value('') is_expected.to contain_nova_config('DEFAULT/allow_resize_to_same_host').with_value('')