diff --git a/lib/puppet/provider/libvirt_domain/virsh.rb b/lib/puppet/provider/libvirt_domain/virsh.rb index 5f576e4..f8ec3cf 100644 --- a/lib/puppet/provider/libvirt_domain/virsh.rb +++ b/lib/puppet/provider/libvirt_domain/virsh.rb @@ -27,7 +27,7 @@ def virsh_define(content) end def initialize(value = {}) - super(value) + super @property_flush = {} end @@ -41,8 +41,8 @@ def self.instances new( ensure: :present, name: Regexp.last_match(2), - active: Regexp.last_match(1) == '-' ? :false : :true, # only active domains have a number - autostart: Regexp.last_match(4) == 'autostart' ? :true : :false + active: (Regexp.last_match(1) == '-') ? :false : :true, # only active domains have a number + autostart: (Regexp.last_match(4) == 'autostart') ? :true : :false, ) end end diff --git a/lib/puppet/provider/libvirt_network/virsh.rb b/lib/puppet/provider/libvirt_network/virsh.rb index d1c88ea..876ff32 100644 --- a/lib/puppet/provider/libvirt_network/virsh.rb +++ b/lib/puppet/provider/libvirt_network/virsh.rb @@ -27,7 +27,7 @@ def virsh_define(content) end def initialize(value = {}) - super(value) + super @property_flush = {} end @@ -38,9 +38,9 @@ def self.instances new( ensure: :present, name: Regexp.last_match(1), - active: Regexp.last_match(2) == 'active' ? :true : :false, - autostart: Regexp.last_match(3) == 'yes' ? :true : :false, - uuid: virsh('--quiet', '--readonly', 'net-uuid', '--network', Regexp.last_match(1)) + active: (Regexp.last_match(2) == 'active') ? :true : :false, + autostart: (Regexp.last_match(3) == 'yes') ? :true : :false, + uuid: virsh('--quiet', '--readonly', 'net-uuid', '--network', Regexp.last_match(1)), ) end end diff --git a/lib/puppet/provider/libvirt_nwfilter/virsh.rb b/lib/puppet/provider/libvirt_nwfilter/virsh.rb index 3354e02..ba99cad 100644 --- a/lib/puppet/provider/libvirt_nwfilter/virsh.rb +++ b/lib/puppet/provider/libvirt_nwfilter/virsh.rb @@ -27,7 +27,7 @@ def virsh_define(content) end def initialize(value = {}) - super(value) + super @property_flush = {} end @@ -38,7 +38,7 @@ def self.instances new( ensure: :present, name: Regexp.last_match(2), - uuid: Regexp.last_match(1) + uuid: Regexp.last_match(1), ) end end diff --git a/lib/puppet/provider/libvirt_pool/virsh.rb b/lib/puppet/provider/libvirt_pool/virsh.rb index 49f7514..e16f7b8 100644 --- a/lib/puppet/provider/libvirt_pool/virsh.rb +++ b/lib/puppet/provider/libvirt_pool/virsh.rb @@ -21,7 +21,7 @@ def self.instances name: values[0], active: %r{^act}.match?(values[1]) ? :true : :false, autostart: values[2].include?('no') ? :false : :true, - provider: name + provider: name, ) end end diff --git a/lib/puppet/provider/libvirtd_conf/ini_setting.rb b/lib/puppet/provider/libvirtd_conf/ini_setting.rb index 2adff0e..a0ccb9d 100644 --- a/lib/puppet/provider/libvirtd_conf/ini_setting.rb +++ b/lib/puppet/provider/libvirtd_conf/ini_setting.rb @@ -2,7 +2,7 @@ Puppet::Type.type(:libvirtd_conf).provide( :ini_setting, - parent: Puppet::Type.type(:ini_setting).provider(:ruby) + parent: Puppet::Type.type(:ini_setting).provider(:ruby), ) do desc ' @summary add config to /etc/libvirt/libvirtd.conf diff --git a/lib/puppet/provider/libvirtd_default/ini_setting.rb b/lib/puppet/provider/libvirtd_default/ini_setting.rb index ac7501f..0069c12 100644 --- a/lib/puppet/provider/libvirtd_default/ini_setting.rb +++ b/lib/puppet/provider/libvirtd_default/ini_setting.rb @@ -2,7 +2,7 @@ Puppet::Type.type(:libvirtd_default).provide( :ini_setting, - parent: Puppet::Type.type(:ini_setting).provider(:ruby) + parent: Puppet::Type.type(:ini_setting).provider(:ruby), ) do desc ' @summary add config to /etc/default/libvirtd diff --git a/lib/puppet/provider/libvirtd_default/ini_setting_redhat.rb b/lib/puppet/provider/libvirtd_default/ini_setting_redhat.rb index 38c2196..8864ced 100644 --- a/lib/puppet/provider/libvirtd_default/ini_setting_redhat.rb +++ b/lib/puppet/provider/libvirtd_default/ini_setting_redhat.rb @@ -2,7 +2,7 @@ Puppet::Type.type(:libvirtd_default).provide( :redhat, - parent: Puppet::Type.type(:libvirtd_default).provider(:ini_setting) + parent: Puppet::Type.type(:libvirtd_default).provider(:ini_setting), ) do desc ' @summary add config to /etc/sysconfig/libvirtd (for redhat family) diff --git a/lib/puppet_x/libvirt/rexml_sorted_attributes.rb b/lib/puppet_x/libvirt/rexml_sorted_attributes.rb index 3f3a300..8042cef 100644 --- a/lib/puppet_x/libvirt/rexml_sorted_attributes.rb +++ b/lib/puppet_x/libvirt/rexml_sorted_attributes.rb @@ -4,7 +4,6 @@ # require 'rexml/document' -# rubocop:disable Lint/ToEnumArguments # rubocop:disable Naming/MethodParameterName # replace each_attribute with a sorted version class REXML::Attributes @@ -13,5 +12,4 @@ def each_attribute(&b) to_enum(:xx_each_attribute).sort_by(&:name).each(&b) end end -# rubocop:enable Lint/ToEnumArguments # rubocop:enable Naming/MethodParameterName diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb index 672cfdd..c5e94a1 100644 --- a/spec/classes/config_spec.rb +++ b/spec/classes/config_spec.rb @@ -8,7 +8,7 @@ uri_aliases: [], uri_default: '', default_conf: {}, - libvirtd_conf: {} } + libvirtd_conf: {}, } end shared_examples 'libvirt::config shared examples' do @@ -32,7 +32,7 @@ context 'with qemu_hook' do let :params do default_params.merge( - qemu_hook: 'drbd' + qemu_hook: 'drbd', ) end @@ -48,7 +48,7 @@ context 'with qemu.conf' do let :params do default_params.merge( - qemu_conf: { 'string' => 'test', 'integer' => 2, 'array' => %w[A B] } + qemu_conf: { 'string' => 'test', 'integer' => 2, 'array' => %w[A B] }, ) end @@ -67,7 +67,7 @@ context 'with uri_aliases' do let :params do default_params.merge( - uri_aliases: ['te=qemu:///system', 'hail=qemu+ssh://root@hail.cloud.example.com/system'] + uri_aliases: ['te=qemu:///system', 'hail=qemu+ssh://root@hail.cloud.example.com/system'], ) end @@ -83,7 +83,7 @@ context 'with uri_default' do let :params do default_params.merge( - uri_default: 'qemu:///system' + uri_default: 'qemu:///system', ) end diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb index 7fd3f14..39d3a73 100644 --- a/spec/classes/install_spec.rb +++ b/spec/classes/install_spec.rb @@ -43,7 +43,7 @@ let :params do default_params.merge( package_ensure: 'actual', - packages: %w[libvirt-clients libvirt qemu-kvm qemu-system-x86] + packages: %w[libvirt-clients libvirt qemu-kvm qemu-system-x86], ) end @@ -55,7 +55,7 @@ let :params do default_params.merge( qemu_hook: 'drbd', - manage_domain_file: 'puppet:///modules/libvirt/dummy' + manage_domain_file: 'puppet:///modules/libvirt/dummy', ) end diff --git a/spec/classes/libvirt_spec.rb b/spec/classes/libvirt_spec.rb index ffa12eb..6713290 100644 --- a/spec/classes/libvirt_spec.rb +++ b/spec/classes/libvirt_spec.rb @@ -17,7 +17,7 @@ uri_aliases: [], uri_default: '', default_conf: {}, - libvirtd_conf: {} } + libvirtd_conf: {}, } end shared_examples 'libvirt shared examples' do @@ -42,7 +42,7 @@ context 'with drbd qemu_hook' do let :params do default_params.merge( - qemu_hook: 'drbd' + qemu_hook: 'drbd', ) end @@ -54,7 +54,7 @@ context 'with create_pools' do let :params do default_params.merge( - create_pools: { 'mypool' => {} } + create_pools: { 'mypool' => {} }, ) end @@ -68,7 +68,7 @@ context 'with create_networks' do let :params do default_params.merge( - create_networks: { 'mynetwork' => { 'bridge' => 'test' } } + create_networks: { 'mynetwork' => { 'bridge' => 'test' } }, ) end @@ -85,7 +85,7 @@ let :params do default_params.merge( load_nwfilter_set: ['test'], - default_nwfilters: { 'test' => { 'filter' => {} } } + default_nwfilters: { 'test' => { 'filter' => {} } }, ) end @@ -98,7 +98,7 @@ context 'with create_domain' do let :params do default_params.merge( - create_domains: { 'mydom' => { 'devices_profile' => 'myprofile' } } + create_domains: { 'mydom' => { 'devices_profile' => 'myprofile' } }, ) end @@ -114,7 +114,7 @@ context 'with drop_default_net true' do let :params do default_params.merge( - drop_default_net: true + drop_default_net: true, ) end @@ -129,7 +129,7 @@ context 'with manage_service false' do let :params do default_params.merge( - manage_service: false + manage_service: false, ) end @@ -140,7 +140,7 @@ context 'with diff_dir' do let :params do default_params.merge( - diff_dir: '/tmp/test' + diff_dir: '/tmp/test', ) end diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb index cb25d9a..f7d5fd5 100644 --- a/spec/classes/service_spec.rb +++ b/spec/classes/service_spec.rb @@ -6,7 +6,7 @@ let :default_params do { service_name: 'libvirtd', service_ensure: 'running', - service_enable: true } + service_enable: true, } end shared_examples 'libvirt::service shared examples' do @@ -38,7 +38,7 @@ default_params.merge( service_ensure: 'stopped', service_enable: false, - service_name: 'dtrivbil' + service_name: 'dtrivbil', ) end @@ -48,7 +48,7 @@ context 'without managing service' do let :params do default_params.merge( - manage_service: false + manage_service: false, ) end @@ -60,7 +60,7 @@ context 'with modular services' do let :params do default_params.merge( - modular_services: { 'virtqemud' => { 'ensure' => 'running', 'enable' => true } } + modular_services: { 'virtqemud' => { 'ensure' => 'running', 'enable' => true } }, ) end diff --git a/spec/defines/domain_spec.rb b/spec/defines/domain_spec.rb index 2d64626..0b2d5ff 100644 --- a/spec/defines/domain_spec.rb +++ b/spec/defines/domain_spec.rb @@ -40,7 +40,7 @@ let(:title) { 'mytitle' } let :params do default_params.merge( - autostart: true + autostart: true, ) end @@ -56,7 +56,7 @@ autostart: false, active: true, ignore: ['//domain/devices/controller'], - replace: true + replace: true, ) end @@ -68,7 +68,7 @@ let :params do default_params.merge( - ensure: 'absent' + ensure: 'absent', ) end diff --git a/spec/defines/network_spec.rb b/spec/defines/network_spec.rb index 8ce87c8..7126bf4 100644 --- a/spec/defines/network_spec.rb +++ b/spec/defines/network_spec.rb @@ -35,7 +35,7 @@ let(:title) { 'mytitle' } let :params do default_params.merge( - bridge: 'test' + bridge: 'test', ) end @@ -48,7 +48,7 @@ let :params do default_params.merge( bridge: 'test', - autostart: false + autostart: false, ) end @@ -60,7 +60,7 @@ let :params do default_params.merge( - ensure: 'absent' + ensure: 'absent', ) end diff --git a/spec/defines/nwfilter_spec.rb b/spec/defines/nwfilter_spec.rb index c8a9534..57be694 100644 --- a/spec/defines/nwfilter_spec.rb +++ b/spec/defines/nwfilter_spec.rb @@ -39,7 +39,7 @@ let(:title) { 'mytitle' } let :params do default_params.merge( - ip: '123.123.123.123' + ip: '123.123.123.123', ) end @@ -51,7 +51,7 @@ let :params do default_params.merge( filterref: [{ 'filter' => 'blah' }], - template: 'generic' + template: 'generic', ) end @@ -63,7 +63,7 @@ let :params do default_params.merge( filterref: [{ 'filter' => 'blah', 'parameters' => [{ 'PORT' => '22' }, { 'PORT' => '80' }] }], - template: 'generic' + template: 'generic', ) end