openstack
/
puppet-nova
Code Issues Proposed changes

Merge "libvirt: Support array for log_filters and log_outputs"

This commit is contained in:
Zuul 2024-04-23 08:05:18 +00:00 committed by Gerrit Code Review
parent ddde8befa8 cf2e04dda2
commit 7040f189ef
16 changed files with 112 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/libvirt/libvirtd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtlockd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtlogd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtnodedevd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtproxyd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtqemud.pp
View File

@ -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;

4
manifests/compute/libvirt/virtsecretd.pp
View File

@ -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;

4
manifests/compute/libvirt/virtstoraged.pp
View File

@ -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;
}
}

12
spec/classes/nova_compute_libvirt_libvirtd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtlockd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtlogd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtnodedevd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtproxyd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtqemud_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtsecretd_spec.rb
View File

@ -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({

12
spec/classes/nova_compute_libvirt_virtstoraged_spec.rb
View File

@ -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({