From b7d5ee6c784db7e4a5b203564a29c1bfa022cb6c Mon Sep 17 00:00:00 2001
From: Daniel Abad <d.abad@cern.ch>
Date: Fri, 1 Feb 2019 16:24:33 +0100
Subject: [PATCH] Expose the versioned_notifications_topics param

After merging https://review.openstack.org/#/c/629818
versioned_notifications_topics are unconfigurable. This
patch exposes this parameter to allow its customization.

Change-Id: I230585a73f0c50ac1a3a14d678071e6088634f1b
---
 manifests/init.pp                                  | 14 ++++++++++----
 ...oned-notifications-topics-d3dc07b1338edd6a.yaml |  4 ++++
 spec/classes/ironic_init_spec.rb                   |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/add-versioned-notifications-topics-d3dc07b1338edd6a.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index ac3ae667..62d6d2d7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -253,6 +253,10 @@
 #   (optional) Notification level for outgoing notifications
 #   Defaults to $::os_service_default
 #
+# [*versioned_notifications_topics*]
+#   (optional) Topics for the versioned notifications issued by Ironic
+#   Defaults to $::os_service_default
+#
 class ironic (
   $enabled                            = true,
   $package_ensure                     = 'present',
@@ -306,6 +310,7 @@ class ironic (
   $notification_driver                = $::os_service_default,
   $notification_topics                = $::os_service_default,
   $notification_level                 = $::os_service_default,
+  $versioned_notifications_topics     = $::os_service_default,
 ) {
 
   include ::ironic::deps
@@ -331,10 +336,11 @@ class ironic (
   }
 
   ironic_config {
-    'DEFAULT/auth_strategy':           value => $auth_strategy;
-    'DEFAULT/my_ip':                   value => $my_ip;
-    'DEFAULT/default_resource_class':  value => $default_resource_class;
-    'DEFAULT/notification_level':      value => $notification_level;
+    'DEFAULT/auth_strategy':                   value => $auth_strategy;
+    'DEFAULT/my_ip':                           value => $my_ip;
+    'DEFAULT/default_resource_class':          value => $default_resource_class;
+    'DEFAULT/notification_level':              value => $notification_level;
+    'DEFAULT/versioned_notifications_topics':  value => $versioned_notifications_topics;
   }
 
   if $sync_db {
diff --git a/releasenotes/notes/add-versioned-notifications-topics-d3dc07b1338edd6a.yaml b/releasenotes/notes/add-versioned-notifications-topics-d3dc07b1338edd6a.yaml
new file mode 100644
index 00000000..3edc5192
--- /dev/null
+++ b/releasenotes/notes/add-versioned-notifications-topics-d3dc07b1338edd6a.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose the ``versioned_notifications_topics`` parameter in ``::ironic``
diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb
index 567c4ab5..5751c8b8 100644
--- a/spec/classes/ironic_init_spec.rb
+++ b/spec/classes/ironic_init_spec.rb
@@ -109,6 +109,7 @@ describe 'ironic' do
       is_expected.to contain_ironic_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>').with_secret(true)
       is_expected.to contain_ironic_config('DEFAULT/default_resource_class').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('DEFAULT/notification_level').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('DEFAULT/versioned_notifications_topics').with_value('<SERVICE DEFAULT>')
     end
   end