From 09955852bb2f45b11b0c67730efb547ec794ec70 Mon Sep 17 00:00:00 2001 From: Mark Gilbert <50398495+MarkProminic@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:17:54 -0600 Subject: [PATCH] fix: spacing that was driving me mad --- lib/vagrant-zones/driver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vagrant-zones/driver.rb b/lib/vagrant-zones/driver.rb index 4cc95b4..5d1c412 100644 --- a/lib/vagrant-zones/driver.rb +++ b/lib/vagrant-zones/driver.rb @@ -527,7 +527,7 @@ def zonenicnatsetup_netplan(uii, opts, mac) 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) netplan3 = %( set-name: #{vnic_name}\n addresses: [#{ip}/#{shrtsubnet}]\n routes:\n - to: default\n via: #{defrouter}\n) - netplan4 = %( nameservers:\n addresses: [#{servers}] ) unless opts[:dns].nil? + netplan4 = %( nameservers:\n addresses: [#{servers}]) unless opts[:dns].nil? netplan = netplan1 + netplan2 + netplan3 + netplan4 cmd = "echo -e '#{netplan}' | sudo tee /etc/netplan/#{vnic_name}.yaml && chmod 400 /etc/netplan/#{vnic_name}.yaml" uii.info(I18n.t('vagrant_zones.netplan_applied_static') + "/etc/netplan/#{vnic_name}.yaml") if ssh_run_command(uii, cmd) @@ -1144,7 +1144,7 @@ def zoneniczloginsetup_netplan(uii, opts, mac) netplan3 = %( set-name: #{vnic_name}\n addresses: [#{ip}/#{shrtsubnet}]\n) netplan3 = %( set-name: #{vnic_name}\n) if opts[:dhcp4] netplan4 = %( routes:\n - to: default\n via: #{defrouter}\n) - netplan5 = %( nameservers:\n addresses: [#{servers}] ) unless opts[:dns].nil? + netplan5 = %( nameservers:\n addresses: [#{servers}]) unless opts[:dns].nil? netplan = netplan1 + netplan2 + netplan3 + netplan5 if opts[:gateway].nil? netplan = netplan1 + netplan2 + netplan3 + netplan4 + netplan5 unless opts[:gateway].nil? cmd = "echo '#{netplan}' > /etc/netplan/#{vnic_name}.yaml && chmod 400 /etc/netplan/#{vnic_name}.yaml"