Remove deprecated api class parameters
These parameters were deprecated during the previous cycle and have had no effect. Change-Id: I3c1ef0de244d6a40ed2af89615748abdbaf3fdfe
This commit is contained in:
@@ -133,28 +133,6 @@
|
|||||||
# the up cells.
|
# the up cells.
|
||||||
# Defaults to $facts['os_service_default']
|
# 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(
|
class nova::api(
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = 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_strategy = $facts['os_service_default'],
|
||||||
$instance_list_cells_batch_fixed_size = $facts['os_service_default'],
|
$instance_list_cells_batch_fixed_size = $facts['os_service_default'],
|
||||||
$list_records_by_skipping_down_cells = $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 {
|
) inherits nova::params {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@@ -198,20 +171,6 @@ class nova::api(
|
|||||||
include nova::availability_zone
|
include nova::availability_zone
|
||||||
include nova::pci
|
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
|
# sanitize service_name and prepare DEFAULT/enabled_apis parameter
|
||||||
if $service_name == $::nova::params::api_service_name {
|
if $service_name == $::nova::params::api_service_name {
|
||||||
nova_config {
|
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;
|
'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
|
# Added arg and if statement prevents this from being run
|
||||||
# where db is not active i.e. the compute
|
# where db is not active i.e. the compute
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
|
|||||||
@@ -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``
|
||||||
@@ -59,9 +59,6 @@ describe 'nova::api' do
|
|||||||
is_expected.to contain_nova_config('api/max_limit').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('api/max_limit').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('api/compute_link_prefix').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('api/compute_link_prefix').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('api/glance_link_prefix').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('api/glance_link_prefix').with_value('<SERVICE DEFAULT>')
|
||||||
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('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('api/enable_instance_password').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('DEFAULT/password_length').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('DEFAULT/password_length').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('DEFAULT/allow_resize_to_same_host').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('DEFAULT/allow_resize_to_same_host').with_value('<SERVICE DEFAULT>')
|
||||||
|
|||||||
Reference in New Issue
Block a user