diff --git a/manifests/init.pp b/manifests/init.pp index d8f46018..3e20e61d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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'], diff --git a/spec/classes/manila_init_spec.rb b/spec/classes/manila_init_spec.rb index c65cfc87..f454bab4 100644 --- a/spec/classes/manila_init_spec.rb +++ b/spec/classes/manila_init_spec.rb @@ -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 => '', + :broadcast_prefix => '', + :group_request_prefix => '', :container_name => 'guest', - :idle_timeout => '0', - :trace => 'false', + :idle_timeout => '', + :trace => '', :ssl_ca_file => '', :ssl_cert_file => '', :ssl_key_file => '',