Skip to content

Commit 018b555

Browse files
committed
fix: rubocop linting errors
1 parent ef22b48 commit 018b555

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/vagrant-zones/driver.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ def zoneniccreate(uii, opts)
727727
uii.info(I18n.t('vagrant_zones.creating_vnic'))
728728
uii.info(" #{vnic_name}")
729729
command = "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac}"
730-
command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || (opts[:vlan]).zero?
730+
command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || opts[:vlan].zero?
731731
command += " #{vnic_name}"
732732
execute(false, command)
733733
end
@@ -928,9 +928,9 @@ def zonecfgshareddisks(uii, _name, config, zcfg)
928928
## zonecfg function for CPU Configurations
929929
def zonecfgcpu(uii, _name, config, zcfg)
930930
uii.info(I18n.t('vagrant_zones.zonecfgcpu')) if config.debug
931-
if config.cpu_configuration == 'simple' && (config.brand == 'bhyve' || config.brand == 'kvm')
931+
if config.cpu_configuration == 'simple' && %w[bhyve kvm].include?(config.brand)
932932
execute(false, %(#{zcfg}"add attr; set name=vcpus; set value=#{config.cpus}; set type=string; end;"))
933-
elsif config.cpu_configuration == 'complex' && (config.brand == 'bhyve' || config.brand == 'kvm')
933+
elsif config.cpu_configuration == 'complex' && %w[bhyve kvm].include?(config.brand)
934934
hash = config.complex_cpu_conf[0]
935935
cstring = %(sockets=#{hash['sockets']},cores=#{hash['cores']},threads=#{hash['threads']})
936936
execute(false, %(#{zcfg}'add attr; set name=vcpus; set value="#{cstring}"; set type=string; end;'))
@@ -1129,7 +1129,7 @@ def zonenicstpzloginsetup(uii, opts, config)
11291129

11301130
## This setups the Netplan based OS Networking via Zlogin
11311131
def zoneniczloginsetup_netplan(uii, opts, mac)
1132-
zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if (opts[:nic_number]).zero?
1132+
zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if opts[:nic_number].zero?
11331133
ip = ipaddress(uii, opts)
11341134
vnic_name = vname(uii, opts)
11351135
servers = dnsservers(uii, opts).map { |server| server['nameserver'] }.join(', ') unless opts[:dns].nil?
@@ -1644,7 +1644,7 @@ def zfssnapcronlist(uii, disk, opts, cronjobs)
16441644
uii.info(I18n.t('vagrant_zones.cron_entries'))
16451645
h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
16461646
h.each do |(_k, d)|
1647-
next unless opts[:list] == d || opts[:list] == 'all'
1647+
next unless [d, 'all'].include?(opts[:list])
16481648

16491649
uii.info(cronjobs[d.to_sym]) unless cronjobs[d.to_sym].nil?
16501650
end
@@ -1659,7 +1659,7 @@ def zfssnapcrondelete(uii, disk, opts, cronjobs)
16591659
h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
16601660
uii.info(I18n.t('vagrant_zones.cron_delete'))
16611661
h.each do |(_k, d)|
1662-
next unless opts[:delete] == d || opts[:delete] == 'all'
1662+
next unless [d, 'all'].include?(opts[:delete])
16631663

16641664
cj = cronjobs[d.to_sym].to_s.gsub('*', '\*')
16651665
rc = "#{rmcr}'#{cj}' | #{sc}"

0 commit comments

Comments
 (0)