openstack/puppet-ironic
Code Issues Proposed changes

conductor: Remove deprecated api_url

Browse Source 
... because the parameter was deprecated during Ussuri cycle[1].

[1] 305964417d

Change-Id: I67b4294993807599f61c4c5eef353f2d97cbccc5
This commit is contained in:
Takashi Kajinami 2022-06-19 22:21:56 +09:00
parent 74b999f28d
commit 818b8ce831
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/conductor.pp
View File

@ -195,10 +195,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*api_url*]
# (optional) Ironic API URL.
# Defaults to undef.
#
# [*configdrive_use_swift*] # [*configdrive_use_swift*]
# (optional) Whether to use Swift for storing config drives instead of # (optional) Whether to use Swift for storing config drives instead of
# the database. Recommended for bigger config drives. # the database. Recommended for bigger config drives.
@ -269,7 +265,6 @@ class ironic::conductor (
$allow_provisioning_in_maintenance = $::os_service_default, $allow_provisioning_in_maintenance = $::os_service_default,
$image_download_concurrency = $::os_service_default, $image_download_concurrency = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$api_url = undef,
$configdrive_use_swift = undef, $configdrive_use_swift = undef,
$inspect_timeout = undef, $inspect_timeout = undef,
$cleaning_network_name = undef, $cleaning_network_name = undef,
@ -284,14 +279,6 @@ class ironic::conductor (
# For backward compatibility # For backward compatibility
include ironic::glance include ironic::glance
if $api_url != undef {
warning('ironic::conductor::api_url is deprecated. \
Use ironic::service_catalog::endpoint_override instead')
ironic_config {
'conductor/api_url': value => $api_url;
}
}
if $configdrive_use_swift != undef { if $configdrive_use_swift != undef {
warning('configdrive_use_swift is deprecated and will be removed \ warning('configdrive_use_swift is deprecated and will be removed \
in a future release. Use configdrive_use_object_store instead') in a future release. Use configdrive_use_object_store instead')

4
releasenotes/notes/remove-conductor-api_url-3a8ea8b86447312f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``ironic::conductor::api_url`` parameter has been removed.

2
spec/classes/ironic_conductor_spec.rb
View File

@ -99,7 +99,6 @@ describe 'ironic::conductor' do
:force_power_state_during_sync => false, :force_power_state_during_sync => false,
:automated_clean => false, :automated_clean => false,
:cleaning_network => '00000000-0000-0000-0000-000000000000', :cleaning_network => '00000000-0000-0000-0000-000000000000',
:api_url => 'https://127.0.0.1:6385',
:provisioning_network => '00000000-0000-0000-0000-000000000000', :provisioning_network => '00000000-0000-0000-0000-000000000000',
:rescuing_network => '00000000-0000-0000-0000-000000000000', :rescuing_network => '00000000-0000-0000-0000-000000000000',
:inspection_network => '00000000-0000-0000-0000-000000000000', :inspection_network => '00000000-0000-0000-0000-000000000000',
@ -133,7 +132,6 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('DEFAULT/enabled_hardware_types').with_value('ipmi,irmc') is_expected.to contain_ironic_config('DEFAULT/enabled_hardware_types').with_value('ipmi,irmc')
is_expected.to contain_ironic_config('conductor/force_power_state_during_sync').with_value(p[:force_power_state_during_sync]) is_expected.to contain_ironic_config('conductor/force_power_state_during_sync').with_value(p[:force_power_state_during_sync])
is_expected.to contain_ironic_config('conductor/automated_clean').with_value(p[:automated_clean]) is_expected.to contain_ironic_config('conductor/automated_clean').with_value(p[:automated_clean])
is_expected.to contain_ironic_config('conductor/api_url').with_value(p[:api_url])
is_expected.to contain_ironic_config('neutron/cleaning_network').with_value('00000000-0000-0000-0000-000000000000') is_expected.to contain_ironic_config('neutron/cleaning_network').with_value('00000000-0000-0000-0000-000000000000')
is_expected.to contain_ironic_config('neutron/provisioning_network').with_value('00000000-0000-0000-0000-000000000000') is_expected.to contain_ironic_config('neutron/provisioning_network').with_value('00000000-0000-0000-0000-000000000000')
is_expected.to contain_ironic_config('neutron/rescuing_network').with_value('00000000-0000-0000-0000-000000000000') is_expected.to contain_ironic_config('neutron/rescuing_network').with_value('00000000-0000-0000-0000-000000000000')