Deprecate fping_path option
The config option fping_path is deprecated as of Rocky[1], we should deprecate in puppet-nova. [1]https://docs.openstack.org/releasenotes/nova/rocky.html Change-Id: Ic1f4ac65cce683618f772c4d3333f123938c0aea Closes-Bug: #1794301
This commit is contained in:
@@ -89,10 +89,6 @@
|
|||||||
# (optional) Whether to validate the service is working after any service refreshes
|
# (optional) Whether to validate the service is working after any service refreshes
|
||||||
# Defaults to false
|
# Defaults to false
|
||||||
#
|
#
|
||||||
# [*fping_path*]
|
|
||||||
# (optional) Full path to fping.
|
|
||||||
# Defaults to '/usr/sbin/fping'
|
|
||||||
#
|
|
||||||
# [*validation_options*]
|
# [*validation_options*]
|
||||||
# (optional) Service validation options
|
# (optional) Service validation options
|
||||||
# Should be a hash of options defined in openstacklib::service_validation
|
# Should be a hash of options defined in openstacklib::service_validation
|
||||||
@@ -246,6 +242,10 @@
|
|||||||
# (optional) User name for the vendordata dynamic plugin credentials.
|
# (optional) User name for the vendordata dynamic plugin credentials.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*fping_path*]
|
||||||
|
# (optional) Full path to fping.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
class nova::api(
|
class nova::api(
|
||||||
$enabled = true,
|
$enabled = true,
|
||||||
$manage_service = true,
|
$manage_service = true,
|
||||||
@@ -269,7 +269,6 @@ class nova::api(
|
|||||||
$validate = false,
|
$validate = false,
|
||||||
$validation_options = {},
|
$validation_options = {},
|
||||||
$instance_name_template = undef,
|
$instance_name_template = undef,
|
||||||
$fping_path = '/usr/sbin/fping',
|
|
||||||
$service_name = $::nova::params::api_service_name,
|
$service_name = $::nova::params::api_service_name,
|
||||||
$enable_proxy_headers_parsing = $::os_service_default,
|
$enable_proxy_headers_parsing = $::os_service_default,
|
||||||
$metadata_cache_expiration = $::os_service_default,
|
$metadata_cache_expiration = $::os_service_default,
|
||||||
@@ -299,6 +298,7 @@ class nova::api(
|
|||||||
$vendordata_dynamic_auth_username = $::os_service_default,
|
$vendordata_dynamic_auth_username = $::os_service_default,
|
||||||
# DEPRECATED PARAMETER
|
# DEPRECATED PARAMETER
|
||||||
$nova_metadata_wsgi_enabled = false,
|
$nova_metadata_wsgi_enabled = false,
|
||||||
|
$fping_path = undef,
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
include ::nova::deps
|
include ::nova::deps
|
||||||
@@ -310,6 +310,10 @@ class nova::api(
|
|||||||
warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.')
|
warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $fping_path {
|
||||||
|
warning('fping_path is deprecated, has no effect and will be removed in the future.')
|
||||||
|
}
|
||||||
|
|
||||||
if $install_cinder_client {
|
if $install_cinder_client {
|
||||||
include ::cinder::client
|
include ::cinder::client
|
||||||
Class['cinder::client'] ~> Nova::Generic_service['api']
|
Class['cinder::client'] ~> Nova::Generic_service['api']
|
||||||
@@ -435,7 +439,6 @@ as a standalone service, or httpd for being run by a httpd server")
|
|||||||
'DEFAULT/enable_network_quota': value => $enable_network_quota;
|
'DEFAULT/enable_network_quota': value => $enable_network_quota;
|
||||||
'DEFAULT/password_length': value => $password_length;
|
'DEFAULT/password_length': value => $password_length;
|
||||||
'api/use_forwarded_for': value => $use_forwarded_for;
|
'api/use_forwarded_for': value => $use_forwarded_for;
|
||||||
'api/fping_path': value => $fping_path;
|
|
||||||
'api/max_limit': value => $max_limit;
|
'api/max_limit': value => $max_limit;
|
||||||
'api/compute_link_prefix': value => $compute_link_prefix;
|
'api/compute_link_prefix': value => $compute_link_prefix;
|
||||||
'api/glance_link_prefix': value => $glance_link_prefix;
|
'api/glance_link_prefix': value => $glance_link_prefix;
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- fping_path option is now deprecated for removal, the
|
||||||
|
parameter has no effect.
|
||||||
@@ -52,7 +52,6 @@ describe 'nova::api' do
|
|||||||
is_expected.to contain_nova_config('DEFAULT/metadata_listen_port').with('value' => '8775')
|
is_expected.to contain_nova_config('DEFAULT/metadata_listen_port').with('value' => '8775')
|
||||||
is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5')
|
is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5')
|
||||||
is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '5')
|
is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '5')
|
||||||
is_expected.to contain_nova_config('api/fping_path').with('value' => '/usr/sbin/fping')
|
|
||||||
is_expected.to contain_oslo__middleware('nova_config').with(
|
is_expected.to contain_oslo__middleware('nova_config').with(
|
||||||
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
|
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user