Skip to content

Commit d62952d

Browse files
authored
fix: linting
1 parent 1403f3e commit d62952d

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

lib/vagrant-zones/driver.rb

+11-14
Original file line numberDiff line numberDiff line change
@@ -1045,31 +1045,28 @@ def zonecfgnicconfig(uii, opts)
10451045
defrouter = opts[:gateway].to_s
10461046
vnic_name = vname(uii, opts)
10471047
config = @machine.provider_config
1048+
10481049
uii.info(I18n.t('vagrant_zones.vnic_setup'))
10491050
uii.info(" #{vnic_name}")
1051+
10501052
strt = "#{@pfexec} zonecfg -z #{@machine.name} "
10511053
cie = config.cloud_init_enabled
10521054
aa = config.allowed_address
1053-
1055+
10541056
case config.brand
10551057
when 'lx'
10561058
shrtstr1 = %(set allowed-address=#{allowed_address}; add property (name=gateway,value="#{defrouter}"); )
10571059
shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
10581060
execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
10591061
when 'bhyve'
1060-
vlan_option = opts[:vlan].nil? || (opts[:vlan]).zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
1061-
1062-
if config.on_demand_vnics
1063-
base_cmd = %(#{strt}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; )
1064-
execute(false, %(#{base_cmd}end;")) unless cie
1065-
execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;")) if cie && aa
1066-
execute(false, %(#{base_cmd}end;")) if cie && !aa
1067-
else
1068-
base_cmd = %(#{strt}"add net; set physical=#{vnic_name}; )
1069-
execute(false, %(#{base_cmd}end;")) unless cie
1070-
execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;")) if cie && aa
1071-
execute(false, %(#{base_cmd}end;")) if cie && !aa
1072-
end
1062+
vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
1063+
base_cmd = config.on_demand_vnics ? \
1064+
%(#{strt}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; ) : \
1065+
%(#{strt}"add net; set physical=#{vnic_name}; )
1066+
1067+
execute(false, %(#{base_cmd}end;)) unless cie
1068+
execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;)) if cie && aa
1069+
execute(false, %(#{base_cmd}end;)) if cie && !aa
10731070
end
10741071
end
10751072

0 commit comments

Comments
 (0)