fix: dhcp netplan

STARTcloud · Feb 4, 2023 · aaebea7 · aaebea7
1 parent b0220a6
commit aaebea7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/vagrant-zones/driver.rb b/lib/vagrant-zones/driver.rb
@@ -1063,8 +1063,10 @@ def zoneniczloginsetup_netplan(uii, opts, mac)
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic'))
         uii.info("  #{vnic_name}")
         netplan1 = %(network:\n  version: 2\n  ethernets:\n    #{vnic_name}:\n      match:\n        macaddress: #{mac}\n)
-        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n)
+        netplan2 = ""
+        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n) if opts[:dhcp4]
         netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n)
+        netplan3 = %(      set-name: #{vnic_name}\n) if opts[:dhcp4]
         netplan4 = %(      gateway4: #{defrouter}\n)
         netplan5 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
         netplan = netplan1 + netplan2 + netplan3 + netplan5 if opts[:gateway].nil?