Remove deprecated parameters to override endpoint url
These parameter were deprecated during Train cycle by [1] and have been
ineffective since then.
[1] fb8e19deb8
Change-Id: Ib2e2f8284a61ae7f8a1ae75a2b2c0a63503ddc08
This commit is contained in:
parent
98c9b5c81b
commit
2a0d0df13a
|
@ -67,12 +67,6 @@
|
|||
# Extra kernel parameters to pass in case of managed boot.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*service_url*]
|
||||
# Has no effect, use endpoint_override.
|
||||
# Defaults to undef
|
||||
#
|
||||
class ironic::drivers::inspector (
|
||||
$auth_type = 'password',
|
||||
$auth_url = $::os_service_default,
|
||||
|
@ -87,17 +81,10 @@ class ironic::drivers::inspector (
|
|||
$callback_endpoint_override = $::os_service_default,
|
||||
$power_off = $::os_service_default,
|
||||
$extra_kernel_params = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$service_url = undef,
|
||||
) {
|
||||
|
||||
include ironic::deps
|
||||
|
||||
if $service_url {
|
||||
warning("The ironic::drivers::inspector::service_url parameter is deprecated and \
|
||||
has no effect. Please use ironic::drivers::inspector::endpoint_override instead.")
|
||||
}
|
||||
|
||||
if is_service_default($system_scope) {
|
||||
$project_name_real = $project_name
|
||||
$project_domain_name_real = $project_domain_name
|
||||
|
|
|
@ -93,10 +93,6 @@
|
|||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*api_servers*]
|
||||
# Has no effect, use endpoint_override.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*swift_account_project_name*]
|
||||
# (optional) The project of account that Glance uses to communicate with Swift.
|
||||
# Will be converted to UUID, and option glance/swift_account will be set in
|
||||
|
@ -124,17 +120,11 @@ class ironic::glance (
|
|||
$swift_temp_url_duration = $::os_service_default,
|
||||
$endpoint_override = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$api_servers = undef,
|
||||
$swift_account_project_name = undef,
|
||||
) {
|
||||
|
||||
include ironic::deps
|
||||
|
||||
if $api_servers {
|
||||
warning("The ironic::glance::api_servers parameter is deprecated and \
|
||||
has no effect. Please use ironic::glance::endpoint_override instead.")
|
||||
}
|
||||
|
||||
if $swift_account_project_name != undef {
|
||||
warning('The swift_account_project_name parameter is deprecated and will be removed in a future release.')
|
||||
}
|
||||
|
|
|
@ -62,12 +62,6 @@
|
|||
# successfully lease addresses.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*api_endpoint*]
|
||||
# Has no effect, use endpoint_override.
|
||||
# Defaults to undef
|
||||
#
|
||||
class ironic::neutron (
|
||||
$auth_type = 'password',
|
||||
$auth_url = $::os_service_default,
|
||||
|
@ -80,15 +74,8 @@ class ironic::neutron (
|
|||
$region_name = $::os_service_default,
|
||||
$endpoint_override = $::os_service_default,
|
||||
$dhcpv6_stateful_address_count = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$api_endpoint = undef,
|
||||
) {
|
||||
|
||||
if $api_endpoint {
|
||||
warning("The ironic::neutron::api_endpoint parameter is deprecated and \
|
||||
has no effect. Please use ironic::neutron::endpoint_override instead.")
|
||||
}
|
||||
|
||||
if is_service_default($system_scope) {
|
||||
$project_name_real = $project_name
|
||||
$project_domain_name_real = $project_domain_name
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``ironic::glance::api_servers`` parameter and
|
||||
the ``ironic::neutron::api_servers`` parameter have been removed.
|
||||
|
||||
- |
|
||||
The ``ironic::drivers::inspector::service_url`` parameter has been removed.
|
|
@ -65,7 +65,6 @@ describe 'ironic::glance' do
|
|||
:user_domain_name => 'NonDefault',
|
||||
:project_domain_name => 'NonDefault',
|
||||
:region_name => 'regionTwo',
|
||||
:api_servers => '10.0.0.1:9292',
|
||||
:api_insecure => true,
|
||||
:num_retries => 42,
|
||||
:swift_account => '00000000-0000-0000-0000-000000000000',
|
||||
|
|
Loading…
Reference in New Issue