openstack/puppet-openstack-integration
Code Issues Proposed changes

qdr: Refactor manifest

Browse Source 
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
This commit is contained in:
Takashi Kajinami
2023-03-20 12:42:12 +09:00
parent 5314aabd92
commit 4e15d6dbce
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/qdr.pp
View File

@@ -12,6 +12,7 @@ class openstack_integration::qdr {
provider => 'pip' provider => 'pip'
} }
} }
$extra_addresses = [{'prefix' => 'openstack.org/om/rpc/multicast', $extra_addresses = [{'prefix' => 'openstack.org/om/rpc/multicast',
'distribution' => 'multicast'}, 'distribution' => 'multicast'},
{'prefix' => 'openstack.org/om/rpc/unicast', {'prefix' => 'openstack.org/om/rpc/unicast',
@@ -24,6 +25,7 @@ class openstack_integration::qdr {
'distribution' => 'closest'}, 'distribution' => 'closest'},
{'prefix' => 'openstack.org/om/notify/anycast', {'prefix' => 'openstack.org/om/notify/anycast',
'distribution' => 'balanced'}] 'distribution' => 'balanced'}]
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
file { '/etc/qpid-dispatch/ssl/private': file { '/etc/qpid-dispatch/ssl/private':
ensure => directory, ensure => directory,
@@ -37,8 +39,10 @@ class openstack_integration::qdr {
require => File['/etc/qpid-dispatch/ssl/private'], require => File['/etc/qpid-dispatch/ssl/private'],
notify => Service['qdrouterd'], notify => Service['qdrouterd'],
} }
}
class { 'qdr': class { 'qdr':
listener_require_ssl => true, listener_require_ssl => $::openstack_integration::config::ssl,
listener_ssl_cert_db => $::openstack_integration::params::ca_bundle_cert_path, listener_ssl_cert_db => $::openstack_integration::params::ca_bundle_cert_path,
listener_ssl_cert_file => $::openstack_integration::params::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_ssl_key_file => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem",
@@ -48,13 +52,4 @@ class openstack_integration::qdr {
listener_auth_peer => true, listener_auth_peer => true,
extra_addresses => $extra_addresses, 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,
}
}
} }