Deprecate cleaning_network_uuid and provisioning_network_uuid
Replaced with new names without _uuid postfix, as these options now accept network names as well. Change-Id: Ice8e6ef2f48085f2689e2b2588a5a811ff58f3b2
This commit is contained in:
Dmitry Tantsur
parent
1632578e69
commit
6cfed073dc
|
|
@ -69,9 +69,9 @@
|
|||
# valid for.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*cleaning_network_uuid*]
|
||||
# (optional) UUID of the network to create Neutron ports on, when booting
|
||||
# to a ramdisk for cleaning using Neutron DHCP.
|
||||
# [*cleaning_network*]
|
||||
# (optional) UUID or name of the network to create Neutron ports on, when
|
||||
# booting to a ramdisk for cleaning using Neutron DHCP.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*cleaning_disk_erase*]
|
||||
|
|
@ -91,10 +91,10 @@
|
|||
# (optional) Ironic API URL.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*provisioning_network_uuid*]
|
||||
# (optional) Neutron network UUID for the ramdisk to be booted into for
|
||||
# provisioning nodes. Required for neutron network interface.
|
||||
# Defaults to $::os_service_default
|
||||
# [*provisioning_network*]
|
||||
# (optional) Neutron network UUID or name for the ramdisk to be booted into
|
||||
# for provisioning nodes. Required for neutron network interface.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*configdrive_use_swift*]
|
||||
# (optional) Whether to use Swift for storing config drives instead of
|
||||
|
|
@ -111,6 +111,16 @@
|
|||
# requested. One of "netboot" or "local".
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED
|
||||
#
|
||||
# [*cleaning_network_uuid*]
|
||||
# (optional) Use cleaning_network instead.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*provisioning_network_uuid*]
|
||||
# (optional) Use provisioning_network instead.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
class ironic::conductor (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
|
|
@ -123,14 +133,17 @@ class ironic::conductor (
|
|||
$swift_account = $::os_service_default,
|
||||
$swift_temp_url_key = $::os_service_default,
|
||||
$swift_temp_url_duration = $::os_service_default,
|
||||
$cleaning_network_uuid = $::os_service_default,
|
||||
$cleaning_network = $::os_service_default,
|
||||
$cleaning_disk_erase = undef,
|
||||
$continue_if_disk_secure_erase_fails = $::os_service_default,
|
||||
$api_url = $::os_service_default,
|
||||
$provisioning_network_uuid = $::os_service_default,
|
||||
$provisioning_network = $::os_service_default,
|
||||
$configdrive_use_swift = $::os_service_default,
|
||||
$configdrive_swift_container = $::os_service_default,
|
||||
$default_boot_option = $::os_service_default,
|
||||
# DEPRECATED
|
||||
$cleaning_network_uuid = $::os_service_default,
|
||||
$provisioning_network_uuid = $::os_service_default,
|
||||
) {
|
||||
|
||||
include ::ironic::deps
|
||||
|
|
@ -139,6 +152,15 @@ class ironic::conductor (
|
|||
|
||||
$enabled_drivers_real = pick($::ironic::enabled_drivers, $enabled_drivers)
|
||||
|
||||
if !is_service_default($cleaning_network_uuid) {
|
||||
warning('cleaning_network_uuid is deprecated, use cleaning_network')
|
||||
}
|
||||
if !is_service_default($provisioning_network_uuid) {
|
||||
warning('provisioning_network_uuid is deprecated, use provisioning_network')
|
||||
}
|
||||
$cleaning_network_real = pick($cleaning_network, $cleaning_network_uuid)
|
||||
$provisioning_network_real = pick($provisioning_network, $provisioning_network_uuid)
|
||||
|
||||
validate_array($enabled_drivers_real)
|
||||
|
||||
# NOTE(dtantsur): all in-tree drivers are IPA-based, so it won't hurt
|
||||
|
|
@ -192,8 +214,8 @@ class ironic::conductor (
|
|||
'glance/swift_account': value => $swift_account;
|
||||
'glance/swift_temp_url_key': value => $swift_temp_url_key, secret => true;
|
||||
'glance/swift_temp_url_duration': value => $swift_temp_url_duration;
|
||||
'neutron/cleaning_network_uuid': value => $cleaning_network_uuid;
|
||||
'neutron/provisioning_network_uuid': value => $provisioning_network_uuid;
|
||||
'neutron/cleaning_network': value => $cleaning_network_real;
|
||||
'neutron/provisioning_network': value => $provisioning_network_real;
|
||||
'deploy/http_url': value => $http_url_real;
|
||||
'deploy/http_root': value => $http_root_real;
|
||||
'deploy/erase_devices_priority': value => $erase_devices_priority;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
deprecations:
|
||||
- Parameters "cleaning_network_uuid" and "provisionig_network_uuid" in
|
||||
"ironic::conductor" manifest replaced with "cleaning_network" and
|
||||
"provisioning_network" accordingly. The old names are deprecated.
|
||||
|
|
@ -70,8 +70,8 @@ describe 'ironic::conductor' do
|
|||
is_expected.to contain_ironic_config('glance/swift_account').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with(:value => '<SERVICE DEFAULT>').with_secret(true)
|
||||
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('neutron/cleaning_network_uuid').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('neutron/provisioning_network_uuid').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('neutron/cleaning_network').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('neutron/provisioning_network').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('deploy/continue_if_disk_secure_erase_fails').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('deploy/http_url').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('deploy/http_root').with(:value => '<SERVICE DEFAULT>')
|
||||
|
|
@ -90,9 +90,9 @@ describe 'ironic::conductor' do
|
|||
:swift_account => '00000000-0000-0000-0000-000000000000',
|
||||
:swift_temp_url_key => 'the-key',
|
||||
:swift_temp_url_duration => 3600,
|
||||
:cleaning_network_uuid => '00000000-0000-0000-0000-000000000000',
|
||||
:cleaning_network => '00000000-0000-0000-0000-000000000000',
|
||||
:api_url => 'https://127.0.0.1:6385',
|
||||
:provisioning_network_uuid => '00000000-0000-0000-0000-000000000000',
|
||||
:provisioning_network => '00000000-0000-0000-0000-000000000000',
|
||||
:cleaning_disk_erase => 'metadata',
|
||||
:http_url => 'http://host:port',
|
||||
:http_root => '/src/www',
|
||||
|
|
@ -110,8 +110,8 @@ describe 'ironic::conductor' do
|
|||
is_expected.to contain_ironic_config('glance/swift_account').with_value(p[:swift_account])
|
||||
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with_value(p[:swift_temp_url_key]).with_secret(true)
|
||||
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with_value(p[:swift_temp_url_duration])
|
||||
is_expected.to contain_ironic_config('neutron/cleaning_network_uuid').with_value('00000000-0000-0000-0000-000000000000')
|
||||
is_expected.to contain_ironic_config('neutron/provisioning_network_uuid').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('deploy/erase_devices_priority').with_value(0)
|
||||
is_expected.to contain_ironic_config('deploy/erase_devices_metadata_priority').with_value(10)
|
||||
is_expected.to contain_ironic_config('deploy/http_url').with_value(p[:http_url])
|
||||
|
|
|
|||
Loading…
Reference in New Issue