openstack/puppet-manila
Code Issues Proposed changes

Merge "Drop redundant hardcoded defaults of amqp options"

Browse Source
This commit is contained in:
Zuul 2023-07-22 22:24:27 +00:00 committed by Gerrit Code Review
commit 61ae2c64e6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -231,12 +231,12 @@ class manila (
$rootwrap_config = '/etc/manila/rootwrap.conf',
$state_path = '/var/lib/manila',
$lock_path = $::manila::params::lock_path,
$amqp_server_request_prefix = 'exclusive',
$amqp_broadcast_prefix = 'broadcast',
$amqp_group_request_prefix = 'unicast',
$amqp_server_request_prefix = $facts['os_service_default'],
$amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_group_request_prefix = $facts['os_service_default'],
$amqp_container_name = 'guest',
$amqp_idle_timeout = '0',
$amqp_trace = false,
$amqp_idle_timeout = $facts['os_service_default'],
$amqp_trace = $facts['os_service_default'],
$amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_ssl_key_file = $facts['os_service_default'],

10
spec/classes/manila_init_spec.rb
View File

@ -210,12 +210,12 @@ describe 'manila' do
end
it { is_expected.to contain_oslo__messaging__amqp('manila_config').with(
:server_request_prefix => 'exclusive',
:broadcast_prefix => 'broadcast',
:group_request_prefix => 'unicast',
:server_request_prefix => '<SERVICE DEFAULT>',
:broadcast_prefix => '<SERVICE DEFAULT>',
:group_request_prefix => '<SERVICE DEFAULT>',
:container_name => 'guest',
:idle_timeout => '0',
:trace => 'false',
:idle_timeout => '<SERVICE DEFAULT>',
:trace => '<SERVICE DEFAULT>',
:ssl_ca_file => '<SERVICE DEFAULT>',
:ssl_cert_file => '<SERVICE DEFAULT>',
:ssl_key_file => '<SERVICE DEFAULT>',