From 95c5da5ae8d0e72ea0d197594db37f2b3f9efd20 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Fri, 20 Jan 2017 15:43:00 +0100
Subject: [PATCH] Fix deprecated cleaning_network_uuid and
 provisioning_network_uuid

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
---
 manifests/conductor.pp                           | 16 ++++++++--------
 ...cleaning-network-compat-9e1ea13a8d96522b.yaml |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/cleaning-network-compat-9e1ea13a8d96522b.yaml

diff --git a/manifests/conductor.pp b/manifests/conductor.pp
index 094c35de..db985302 100644
--- a/manifests/conductor.pp
+++ b/manifests/conductor.pp
@@ -115,11 +115,11 @@
 #
 # [*cleaning_network_uuid*]
 #   (optional) Use cleaning_network instead.
-#   Defaults to $::os_service_default
+#   Defaults to undef
 #
 # [*provisioning_network_uuid*]
 #   (optional) Use provisioning_network instead.
-#   Defaults to $::os_service_default
+#   Defaults to undef
 #
 class ironic::conductor (
   $package_ensure                       = 'present',
@@ -142,8 +142,8 @@ class ironic::conductor (
   $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,
+  $cleaning_network_uuid                = undef,
+  $provisioning_network_uuid            = undef,
 ) {
 
   include ::ironic::deps
@@ -152,14 +152,14 @@ class ironic::conductor (
 
   $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')
   }
-  if !is_service_default($provisioning_network_uuid) {
+  if $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)
+  $cleaning_network_real = pick($cleaning_network_uuid, $cleaning_network)
+  $provisioning_network_real = pick($provisioning_network_uuid, $provisioning_network)
 
   validate_array($enabled_drivers_real)
 
diff --git a/releasenotes/notes/cleaning-network-compat-9e1ea13a8d96522b.yaml b/releasenotes/notes/cleaning-network-compat-9e1ea13a8d96522b.yaml
new file mode 100644
index 00000000..d966baa5
--- /dev/null
+++ b/releasenotes/notes/cleaning-network-compat-9e1ea13a8d96522b.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Fix compatibility with deprecated options "cleaning_network_uuid" and
+    "provisioning_network_uuid".