Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/puppet/provider/libvirt_domain/virsh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def virsh_define(content)
end

def initialize(value = {})
super(value)
super
@property_flush = {}
end

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions lib/puppet/provider/libvirt_network/virsh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def virsh_define(content)
end

def initialize(value = {})
super(value)
super
@property_flush = {}
end

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/provider/libvirt_nwfilter/virsh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def virsh_define(content)
end

def initialize(value = {})
super(value)
super
@property_flush = {}
end

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/libvirt_pool/virsh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/libvirtd_conf/ini_setting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/libvirtd_default/ini_setting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/libvirtd_default/ini_setting_redhat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions lib/puppet_x/libvirt/rexml_sorted_attributes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
10 changes: 5 additions & 5 deletions spec/classes/config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
uri_aliases: [],
uri_default: '',
default_conf: {},
libvirtd_conf: {} }
libvirtd_conf: {}, }
end

shared_examples 'libvirt::config shared examples' do
Expand All @@ -32,7 +32,7 @@
context 'with qemu_hook' do
let :params do
default_params.merge(
qemu_hook: 'drbd'
qemu_hook: 'drbd',
)
end

Expand All @@ -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

Expand All @@ -67,7 +67,7 @@
context 'with uri_aliases' do
let :params do
default_params.merge(
uri_aliases: ['te=qemu:///system', 'hail=qemu+ssh://[email protected]/system']
uri_aliases: ['te=qemu:///system', 'hail=qemu+ssh://[email protected]/system'],
)
end

Expand All @@ -83,7 +83,7 @@
context 'with uri_default' do
let :params do
default_params.merge(
uri_default: 'qemu:///system'
uri_default: 'qemu:///system',
)
end

Expand Down
4 changes: 2 additions & 2 deletions spec/classes/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
18 changes: 9 additions & 9 deletions spec/classes/libvirt_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
uri_aliases: [],
uri_default: '',
default_conf: {},
libvirtd_conf: {} }
libvirtd_conf: {}, }
end

shared_examples 'libvirt shared examples' do
Expand All @@ -42,7 +42,7 @@
context 'with drbd qemu_hook' do
let :params do
default_params.merge(
qemu_hook: 'drbd'
qemu_hook: 'drbd',
)
end

Expand All @@ -54,7 +54,7 @@
context 'with create_pools' do
let :params do
default_params.merge(
create_pools: { 'mypool' => {} }
create_pools: { 'mypool' => {} },
)
end

Expand All @@ -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

Expand All @@ -85,7 +85,7 @@
let :params do
default_params.merge(
load_nwfilter_set: ['test'],
default_nwfilters: { 'test' => { 'filter' => {} } }
default_nwfilters: { 'test' => { 'filter' => {} } },
)
end

Expand All @@ -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

Expand All @@ -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

Expand All @@ -129,7 +129,7 @@
context 'with manage_service false' do
let :params do
default_params.merge(
manage_service: false
manage_service: false,
)
end

Expand All @@ -140,7 +140,7 @@
context 'with diff_dir' do
let :params do
default_params.merge(
diff_dir: '/tmp/test'
diff_dir: '/tmp/test',
)
end

Expand Down
8 changes: 4 additions & 4 deletions spec/classes/service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -38,7 +38,7 @@
default_params.merge(
service_ensure: 'stopped',
service_enable: false,
service_name: 'dtrivbil'
service_name: 'dtrivbil',
)
end

Expand All @@ -48,7 +48,7 @@
context 'without managing service' do
let :params do
default_params.merge(
manage_service: false
manage_service: false,
)
end

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions spec/defines/domain_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
let(:title) { 'mytitle' }
let :params do
default_params.merge(
autostart: true
autostart: true,
)
end

Expand All @@ -56,7 +56,7 @@
autostart: false,
active: true,
ignore: ['//domain/devices/controller'],
replace: true
replace: true,
)
end

Expand All @@ -68,7 +68,7 @@

let :params do
default_params.merge(
ensure: 'absent'
ensure: 'absent',
)
end

Expand Down
6 changes: 3 additions & 3 deletions spec/defines/network_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
let(:title) { 'mytitle' }
let :params do
default_params.merge(
bridge: 'test'
bridge: 'test',
)
end

Expand All @@ -48,7 +48,7 @@
let :params do
default_params.merge(
bridge: 'test',
autostart: false
autostart: false,
)
end

Expand All @@ -60,7 +60,7 @@

let :params do
default_params.merge(
ensure: 'absent'
ensure: 'absent',
)
end

Expand Down
6 changes: 3 additions & 3 deletions spec/defines/nwfilter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
let(:title) { 'mytitle' }
let :params do
default_params.merge(
ip: '123.123.123.123'
ip: '123.123.123.123',
)
end

Expand All @@ -51,7 +51,7 @@
let :params do
default_params.merge(
filterref: [{ 'filter' => 'blah' }],
template: 'generic'
template: 'generic',
)
end

Expand All @@ -63,7 +63,7 @@
let :params do
default_params.merge(
filterref: [{ 'filter' => 'blah', 'parameters' => [{ 'PORT' => '22' }, { 'PORT' => '80' }] }],
template: 'generic'
template: 'generic',
)
end

Expand Down
Loading