From 4e15d6dbced7770dfa0b3db3500b6a65ebe875c3 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 20 Mar 2023 12:42:12 +0900
Subject: [PATCH] qdr: Refactor manifest

listener_ssl_* parameters are ignored if listener_require_ssl is false
so we can set these parameters even if ssl is disabled.

Change-Id: Ib6bf151f7b430148ed69a21a00709a51767da177
---
 manifests/qdr.pp | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/manifests/qdr.pp b/manifests/qdr.pp
index f940ff437..29a440bec 100644
--- a/manifests/qdr.pp
+++ b/manifests/qdr.pp
@@ -12,6 +12,7 @@ class openstack_integration::qdr {
       provider => 'pip'
     }
   }
+
   $extra_addresses = [{'prefix'       => 'openstack.org/om/rpc/multicast',
                       'distribution' => 'multicast'},
                       {'prefix'       => 'openstack.org/om/rpc/unicast',
@@ -24,6 +25,7 @@ class openstack_integration::qdr {
                       'distribution' => 'closest'},
                       {'prefix'       => 'openstack.org/om/notify/anycast',
                       'distribution' => 'balanced'}]
+
   if $::openstack_integration::config::ssl {
     file { '/etc/qpid-dispatch/ssl/private':
       ensure                  => directory,
@@ -37,24 +39,17 @@ class openstack_integration::qdr {
       require  => File['/etc/qpid-dispatch/ssl/private'],
       notify   => Service['qdrouterd'],
     }
-    class { 'qdr':
-      listener_require_ssl   => true,
-      listener_ssl_cert_db   => $::openstack_integration::params::ca_bundle_cert_path,
-      listener_ssl_cert_file => $::openstack_integration::params::cert_path,
-      listener_ssl_key_file  => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem",
-      listener_addr          => $::openstack_integration::config::host,
-      listener_port          => $::openstack_integration::config::messaging_default_port,
-      listener_sasl_mech     => 'PLAIN',
-      listener_auth_peer     => true,
-      extra_addresses        => $extra_addresses,
-    }
-  } else {
-    class { 'qdr':
-      listener_addr      => $::openstack_integration::config::host,
-      listener_port      => $::openstack_integration::config::messaging_default_port,
-      listener_sasl_mech => 'PLAIN',
-      listener_auth_peer => true,
-      extra_addresses    => $extra_addresses,
-    }
+  }
+
+  class { 'qdr':
+    listener_require_ssl   => $::openstack_integration::config::ssl,
+    listener_ssl_cert_db   => $::openstack_integration::params::ca_bundle_cert_path,
+    listener_ssl_cert_file => $::openstack_integration::params::cert_path,
+    listener_ssl_key_file  => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem",
+    listener_addr          => $::openstack_integration::config::host,
+    listener_port          => $::openstack_integration::config::messaging_default_port,
+    listener_sasl_mech     => 'PLAIN',
+    listener_auth_peer     => true,
+    extra_addresses        => $extra_addresses,
   }
 }