diff --git a/manifests/compute/libvirt/libvirtd.pp b/manifests/compute/libvirt/libvirtd.pp index 9d38dfd6c..e5d689e66 100644 --- a/manifests/compute/libvirt/libvirtd.pp +++ b/manifests/compute/libvirt/libvirtd.pp @@ -64,8 +64,8 @@ class nova::compute::libvirt::libvirtd ( libvirtd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; diff --git a/manifests/compute/libvirt/virtlockd.pp b/manifests/compute/libvirt/virtlockd.pp index 982d483be..23c726121 100644 --- a/manifests/compute/libvirt/virtlockd.pp +++ b/manifests/compute/libvirt/virtlockd.pp @@ -50,8 +50,8 @@ class nova::compute::libvirt::virtlockd ( virtlockd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_size': value => $max_size; diff --git a/manifests/compute/libvirt/virtlogd.pp b/manifests/compute/libvirt/virtlogd.pp index 0708ab27f..9c7ed6d88 100644 --- a/manifests/compute/libvirt/virtlogd.pp +++ b/manifests/compute/libvirt/virtlogd.pp @@ -50,8 +50,8 @@ class nova::compute::libvirt::virtlogd ( virtlogd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_size': value => $max_size; diff --git a/manifests/compute/libvirt/virtnodedevd.pp b/manifests/compute/libvirt/virtnodedevd.pp index 262cc2ace..e6a5d246a 100644 --- a/manifests/compute/libvirt/virtnodedevd.pp +++ b/manifests/compute/libvirt/virtnodedevd.pp @@ -56,8 +56,8 @@ class nova::compute::libvirt::virtnodedevd ( virtnodedevd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; diff --git a/manifests/compute/libvirt/virtproxyd.pp b/manifests/compute/libvirt/virtproxyd.pp index 3c7607805..bd12d4a4c 100644 --- a/manifests/compute/libvirt/virtproxyd.pp +++ b/manifests/compute/libvirt/virtproxyd.pp @@ -64,8 +64,8 @@ class nova::compute::libvirt::virtproxyd ( virtproxyd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; diff --git a/manifests/compute/libvirt/virtqemud.pp b/manifests/compute/libvirt/virtqemud.pp index ddde22ccb..134729c02 100644 --- a/manifests/compute/libvirt/virtqemud.pp +++ b/manifests/compute/libvirt/virtqemud.pp @@ -57,8 +57,8 @@ class nova::compute::libvirt::virtqemud ( virtqemud_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; diff --git a/manifests/compute/libvirt/virtsecretd.pp b/manifests/compute/libvirt/virtsecretd.pp index afda5af2a..f01655ad8 100644 --- a/manifests/compute/libvirt/virtsecretd.pp +++ b/manifests/compute/libvirt/virtsecretd.pp @@ -56,8 +56,8 @@ class nova::compute::libvirt::virtsecretd ( virtsecretd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; diff --git a/manifests/compute/libvirt/virtstoraged.pp b/manifests/compute/libvirt/virtstoraged.pp index f69f763d6..68895eef1 100644 --- a/manifests/compute/libvirt/virtstoraged.pp +++ b/manifests/compute/libvirt/virtstoraged.pp @@ -33,8 +33,8 @@ class nova::compute::libvirt::virtstoraged ( virtstoraged_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters, quote => true; - 'log_outputs': value => $log_outputs, quote => true; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; 'ovs_timeout': value => $ovs_timeout; } } diff --git a/spec/classes/nova_compute_libvirt_libvirtd_spec.rb b/spec/classes/nova_compute_libvirt_libvirtd_spec.rb index f2de0235d..38c32f8a4 100644 --- a/spec/classes/nova_compute_libvirt_libvirtd_spec.rb +++ b/spec/classes/nova_compute_libvirt_libvirtd_spec.rb @@ -60,6 +60,18 @@ eos it { is_expected.to contain_libvirtd_config('tls_priority').with_value(params[:tls_priority]).with_quote(true)} it { is_expected.to contain_libvirtd_config('ovs_timeout').with_value(params[:ovs_timeout])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_libvirtd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_libvirtd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtlockd_spec.rb b/spec/classes/nova_compute_libvirt_virtlockd_spec.rb index f30bd1088..1a72a1036 100644 --- a/spec/classes/nova_compute_libvirt_virtlockd_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtlockd_spec.rb @@ -44,6 +44,18 @@ describe 'nova::compute::libvirt::virtlockd' do it { is_expected.to contain_virtlockd_config('max_size').with_value(params[:max_size])} it { is_expected.to contain_virtlockd_config('max_backups').with_value(params[:max_backups])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtlockd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtlockd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtlogd_spec.rb b/spec/classes/nova_compute_libvirt_virtlogd_spec.rb index 5c2ac1e17..000ac2b63 100644 --- a/spec/classes/nova_compute_libvirt_virtlogd_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtlogd_spec.rb @@ -44,6 +44,18 @@ describe 'nova::compute::libvirt::virtlogd' do it { is_expected.to contain_virtlogd_config('max_size').with_value(params[:max_size])} it { is_expected.to contain_virtlogd_config('max_backups').with_value(params[:max_backups])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtlogd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtlogd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtnodedevd_spec.rb b/spec/classes/nova_compute_libvirt_virtnodedevd_spec.rb index 1f6c35cc2..74a7b6b4a 100644 --- a/spec/classes/nova_compute_libvirt_virtnodedevd_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtnodedevd_spec.rb @@ -47,6 +47,18 @@ describe 'nova::compute::libvirt::virtnodedevd' do it { is_expected.to contain_virtnodedevd_config('admin_max_client_requests').with_value(params[:admin_max_client_requests])} it { is_expected.to contain_virtnodedevd_config('ovs_timeout').with_value(params[:ovs_timeout])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtnodedevd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtnodedevd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtproxyd_spec.rb b/spec/classes/nova_compute_libvirt_virtproxyd_spec.rb index 9bba96ff2..b97260d84 100644 --- a/spec/classes/nova_compute_libvirt_virtproxyd_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtproxyd_spec.rb @@ -50,6 +50,18 @@ describe 'nova::compute::libvirt::virtproxyd' do it { is_expected.to contain_virtproxyd_config('ovs_timeout').with_value(params[:ovs_timeout])} it { is_expected.to contain_virtproxyd_config('tls_priority').with_value(params[:tls_priority]).with_quote(true)} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtproxyd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtproxyd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtqemud_spec.rb b/spec/classes/nova_compute_libvirt_virtqemud_spec.rb index 006b4b3f3..11b67a4d9 100644 --- a/spec/classes/nova_compute_libvirt_virtqemud_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtqemud_spec.rb @@ -47,6 +47,18 @@ describe 'nova::compute::libvirt::virtqemud' do it { is_expected.to contain_virtqemud_config('admin_max_client_requests').with_value(params[:admin_max_client_requests])} it { is_expected.to contain_virtqemud_config('ovs_timeout').with_value(params[:ovs_timeout])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtqemud_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtqemud_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtsecretd_spec.rb b/spec/classes/nova_compute_libvirt_virtsecretd_spec.rb index ee23905dc..a3de94008 100644 --- a/spec/classes/nova_compute_libvirt_virtsecretd_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtsecretd_spec.rb @@ -47,6 +47,18 @@ describe 'nova::compute::libvirt::virtsecretd' do it { is_expected.to contain_virtsecretd_config('admin_max_client_requests').with_value(params[:admin_max_client_requests])} it { is_expected.to contain_virtsecretd_config('ovs_timeout').with_value(params[:ovs_timeout])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtsecretd_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtsecretd_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({ diff --git a/spec/classes/nova_compute_libvirt_virtstoraged_spec.rb b/spec/classes/nova_compute_libvirt_virtstoraged_spec.rb index 84b53e536..b634d3355 100644 --- a/spec/classes/nova_compute_libvirt_virtstoraged_spec.rb +++ b/spec/classes/nova_compute_libvirt_virtstoraged_spec.rb @@ -35,6 +35,18 @@ describe 'nova::compute::libvirt::virtstoraged' do it { is_expected.to contain_virtstoraged_config('log_filters').with_value(params[:log_filters]).with_quote(true)} it { is_expected.to contain_virtstoraged_config('ovs_timeout').with_value(params[:ovs_timeout])} end + + context 'with array values' do + let :params do + { + :log_outputs => ['3:syslog', '3:stderr'], + :log_filters => ['1:logging', '4:object', '4:json', '4:event', '1:util'], + } + end + + it { is_expected.to contain_virtstoraged_config('log_outputs').with_value('3:syslog 3:stderr').with_quote(true)} + it { is_expected.to contain_virtstoraged_config('log_filters').with_value('1:logging 4:object 4:json 4:event 1:util').with_quote(true)} + end end on_supported_os({