openstack/puppet-ironic
Code Issues Proposed changes

Fix deprecated cleaning_network_uuid and provisioning_network_uuid

Browse Source 
They got broken during deprecation due to incorrect use of pick().
This patch fixes it. Report: https://bugzilla.redhat.com/show_bug.cgi?id=1412754

Change-Id: Ibfb40840c8ee82628fd22525d2a291780de62298
This commit is contained in:
Dmitry Tantsur
2017-01-20 15:43:00 +01:00
parent ab50e55511
commit 95c5da5ae8
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/conductor.pp
View File

@@ -115,11 +115,11 @@
# #
# [*cleaning_network_uuid*] # [*cleaning_network_uuid*]
# (optional) Use cleaning_network instead. # (optional) Use cleaning_network instead.
# Defaults to $::os_service_default # Defaults to undef
# #
# [*provisioning_network_uuid*] # [*provisioning_network_uuid*]
# (optional) Use provisioning_network instead. # (optional) Use provisioning_network instead.
# Defaults to $::os_service_default # Defaults to undef
# #
class ironic::conductor ( class ironic::conductor (
$package_ensure = 'present', $package_ensure = 'present',
@@ -142,8 +142,8 @@ class ironic::conductor (
$configdrive_swift_container = $::os_service_default, $configdrive_swift_container = $::os_service_default,
$default_boot_option = $::os_service_default, $default_boot_option = $::os_service_default,
# DEPRECATED # DEPRECATED
$cleaning_network_uuid = $::os_service_default, $cleaning_network_uuid = undef,
$provisioning_network_uuid = $::os_service_default, $provisioning_network_uuid = undef,
) { ) {
include ::ironic::deps include ::ironic::deps
@@ -152,14 +152,14 @@ class ironic::conductor (
$enabled_drivers_real = pick($::ironic::enabled_drivers, $enabled_drivers) $enabled_drivers_real = pick($::ironic::enabled_drivers, $enabled_drivers)
if !is_service_default($cleaning_network_uuid) { if $cleaning_network_uuid {
warning('cleaning_network_uuid is deprecated, use cleaning_network') warning('cleaning_network_uuid is deprecated, use cleaning_network')
} }
if !is_service_default($provisioning_network_uuid) { if $provisioning_network_uuid {
warning('provisioning_network_uuid is deprecated, use provisioning_network') warning('provisioning_network_uuid is deprecated, use provisioning_network')
} }
$cleaning_network_real = pick($cleaning_network, $cleaning_network_uuid) $cleaning_network_real = pick($cleaning_network_uuid, $cleaning_network)
$provisioning_network_real = pick($provisioning_network, $provisioning_network_uuid) $provisioning_network_real = pick($provisioning_network_uuid, $provisioning_network)
validate_array($enabled_drivers_real) validate_array($enabled_drivers_real)

4
releasenotes/notes/cleaning-network-compat-9e1ea13a8d96522b.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
fixes:
- Fix compatibility with deprecated options "cleaning_network_uuid" and
"provisioning_network_uuid".