vagrant-zones 0.1.41 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888c846d3f7cb6ed5b42036bc9610a55443b6d2e9b01c901c5f6559f362949d0
-  data.tar.gz: 250c0f9924123d10075da67b52d0fe70fa4771cee6d7d33e88939bd981e06ec2
+  metadata.gz: 967837c3c3d0fe50f53375d806beee05f2aa4ec5270c7b028bb8b69f783bb338
+  data.tar.gz: dd61e58ead769e79ad625327e87457ceeadb048ba0efa2405dec1621f5657914
 SHA512:
-  metadata.gz: 6e70c1cd2aa695ee474e9950c5907937258174cb8887b22f828a23b208588f14b3655dff20a182abaaebb0cc7eeea331671713e0078b47f06696391edcf71982
-  data.tar.gz: 9b8c1cb87c59402765d6bc863b6cf30140cef421fc092b37a86b47a3de8552a3de49cf248373f0dc8995283184c918325cd117c46a98f2fc9f0b0556e2db5670
+  metadata.gz: 356ffb8315792d279bd05cc033189d870afb3ae72b9b5a7130465fbc5db8983a7def010327f05937882011ed1beb48024db5ace448f8656613e8bc8df509f283
+  data.tar.gz: 13b8f7a5604b739e8aa0236b1a19698db438483ab9f92f3517fbd61ac56f9a5f317ac3f4b297b1f30a743531e56201cf9b52cd93fd3463f0c2982b13b3ad159a

data/CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+### [0.1.45](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.44...v0.1.45) (2022-11-23)
+
+
+### Bug Fixes
+
+* version ([7594be6](https://www.github.com/STARTcloud/vagrant-zones/commit/7594be69cf137e3504c5de0d7f12589441bf8444))
+
+### [0.1.44](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.43...v0.1.44) (2022-11-23)
+
+
+### Bug Fixes
+
+* spacing ([eee020e](https://www.github.com/STARTcloud/vagrant-zones/commit/eee020edbca4d911c9d6c8e600ebd116c1034b68))
+
+### [0.1.43](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.42...v0.1.43) (2022-11-23)
+
+
+### Bug Fixes
+
+* spacing ([98a3e28](https://www.github.com/STARTcloud/vagrant-zones/commit/98a3e28f9497765841ed649fc9711e1aa44bd752))
+
+### [0.1.42](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.41...v0.1.42) (2022-11-23)
+
+
+### Bug Fixes
+
+* missing config var ([19ad3b1](https://www.github.com/STARTcloud/vagrant-zones/commit/19ad3b1b1699f638443ed2bec27f925bcb957fdc))
+
+### [0.1.12](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.11...v0.1.12) (2022-11-23)
+
+
+### Bug Fixes
+
+* release 0.1.42 ([3406cc3](https://www.github.com/STARTcloud/vagrant-zones/commit/3406cc31ffe06ae118a3392cc1999a9f486ce4bb))
+* version ([18ecccf](https://www.github.com/STARTcloud/vagrant-zones/commit/18ecccf75703819390479e169a86b2908b65a34a))
+
+### [0.1.11](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.10...v0.1.11) (2022-11-23)
+
+
+### Bug Fixes
+
+* login_wait variable ([713097a](https://www.github.com/STARTcloud/vagrant-zones/commit/713097ad0b4677509231bd2ab81a53e0fa8875c5))
+
+### [0.1.10](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.9...v0.1.10) (2022-11-23)
+
+
+### Bug Fixes
+
+* dns entries ([7cf0246](https://www.github.com/STARTcloud/vagrant-zones/commit/7cf024664f1bcb222c07b30832ae7da91451a482))
+
+### [0.1.9](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.8...v0.1.9) (2022-11-05)
+
+
+### Bug Fixes
+
+* nameserverscloudinit ([506a8c6](https://www.github.com/STARTcloud/vagrant-zones/commit/506a8c69976a03efcc9f62388bbebfdabc870942))
+
+### [0.1.8](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.7...v0.1.8) (2022-11-02)
+
+
+### Bug Fixes
+
+* version fix ([5fa814e](https://www.github.com/STARTcloud/vagrant-zones/commit/5fa814eac5006344845616e065d49b68ba67326c))
+
 ### [0.1.7](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.6...v0.1.7) (2022-11-02)
 
 

data/lib/vagrant-zones/config.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
     # This is used define the variables for the project
     class Config < Vagrant.plugin('2', :config)
       # rubocop:disable Layout/LineLength
-      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :safe_shutdown, :boxshortname, :kernel, :debug, :debug_boot, :private_network, :winalcheck, :winlcheck, :lcheck, :alcheck, :snapshot_script, :diskif, :netif, :cdroms, :disk1path, :disk1size, :cpus, :cpu_configuration, :boot, :complex_cpu_conf, :memory, :vagrant_user, :vagrant_user_private_key_path, :setup_wait, :clean_shutdown_time, :dhcp, :vagrant_user_pass, :firmware_type, :vm_type, :partition_id, :shared_disk_enabled, :shared_dir, :acpi, :os_type, :console, :consolehost, :consoleport, :console_onboot, :hostbridge, :sshport, :rdpport, :override, :additional_disks, :cloud_init_resolvers, :cloud_init_enabled, :cloud_init_dnsdomain, :cloud_init_password, :cloud_init_sshkey, :cloud_init_conf, :dns, :box, :vagrant_cloud_creator, :winbooted_string, :booted_string, :zunlockbootkey, :zunlockboot, :xhci_enabled
+      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :safe_shutdown, :boxshortname, :kernel, :debug, :debug_boot, :private_network, :winalcheck, :winlcheck, :lcheck, :alcheck, :snapshot_script, :diskif, :netif, :cdroms, :disk1path, :disk1size, :cpus, :cpu_configuration, :boot, :complex_cpu_conf, :memory, :vagrant_user, :vagrant_user_private_key_path, :setup_wait, :clean_shutdown_time, :dhcp4, :vagrant_user_pass, :firmware_type, :vm_type, :partition_id, :shared_disk_enabled, :shared_dir, :acpi, :os_type, :console, :consolehost, :consoleport, :console_onboot, :hostbridge, :sshport, :rdpport, :override, :additional_disks, :cloud_init_resolvers, :cloud_init_enabled, :cloud_init_dnsdomain, :cloud_init_password, :cloud_init_sshkey, :cloud_init_conf, :dns, :box, :vagrant_cloud_creator, :winbooted_string, :booted_string, :zunlockbootkey, :zunlockboot, :xhci_enabled, :login_wait
 
       # rubocop:enable Layout/LineLength
 
@@ -61,6 +61,7 @@ module VagrantPlugins
         @vagrant_user_private_key_path = './id_rsa'
         @xhci_enabled = 'off'
         @override = false
+        @login_wait = 5
         @cloud_init_enabled = false
         @cloud_init_conf = 'on'
         @cloud_init_dnsdomain = nil

data/lib/vagrant-zones/driver.rb

@@ -211,13 +211,10 @@ module VagrantPlugins
       end
 
       # This Sanitizes the DNS Records
-      def dnsservers(uii)
+      def dnsservers(uii, opts)
         config = @machine.provider_config
-        servers = []
-        config.dns.each do |server|
-          servers.append(server)
-        end
-        servers = [{ 'nameserver' => '1.1.1.1' }, { 'nameserver' => '8.8.8.8' }] if config.dns.nil?
+        servers = opts['dns']
+        servers = [{ 'nameserver' => '1.1.1.1' }, { 'nameserver' => '8.8.8.8' }] if opts['dns'].nil?
         uii.info(I18n.t('vagrant_zones.nsservers') + servers.to_s) if config.debug
         servers
       end
@@ -270,7 +267,7 @@ module VagrantPlugins
         @machine.config.vm.networks.each do |_adaptertype, opts|
           responses = []
           nic_type = nictype(opts)
-          if opts[:dhcp] && opts[:managed]
+          if opts[:dhcp4] && opts[:managed]
             vnic_name = "vnic#{nic_type}#{vtype(uii)}_#{config.partition_id}_#{opts[:nic_number]}"
             PTY.spawn("pfexec zlogin -C #{name}") do |zlogin_read, zlogin_write, pid|
               command = "ip -4 addr show dev #{vnic_name} | head -n -1 | tail -1 | awk '{ print $2 }' | cut -f1 -d\"/\" \n"
@@ -291,7 +288,7 @@ module VagrantPlugins
               end
               Process.kill('HUP', pid)
             end
-          elsif (opts[:dhcp] == false || opts[:dhcp].nil?) && opts[:managed]
+          elsif (opts[:dhcp4] == false || opts[:dhcp4].nil?) && opts[:managed]
             ip = opts[:ip].to_s
             return nil if ip.empty?
 
@@ -508,13 +505,13 @@ module VagrantPlugins
         defrouter = opts[:gateway].to_s
         vnic_name = vname(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
-        servers = dnsservers(uii)
+        servers = dnsservers(uii, opts)
         ## Begin of code block to move to Netplan function
         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[:dhcp]}\n      dhcp6: #{opts[:dhcp6]}\n)
+        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n)
         netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      gateway4: #{defrouter}\n)
         netplan4 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
         netplan = netplan1 + netplan2 + netplan3 + netplan4
@@ -533,7 +530,7 @@ module VagrantPlugins
         defrouter = opts[:gateway].to_s
         vnic_name = vname(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
-        servers = dnsservers(uii)
+        servers = dnsservers(uii, opts)
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic_dladm'))
         uii.info("  #{vnic_name}")
 
@@ -976,10 +973,14 @@ module VagrantPlugins
         uii.info("  #{ccip}") unless ccip.nil?
         execute(false, %(#{zcfg}"add attr; set name=password; set value=#{ccip}; set type=string; end;")) unless ccip.nil?
 
-        cclir = config.cloud_init_resolvers
-        uii.info(I18n.t('vagrant_zones.setting_cloud_resolvers')) unless cclir.nil?
-        uii.info("  #{cclir}") unless cclir.nil?
-        execute(false, %(#{zcfg}"add attr; set name=resolvers; set value=#{cclir}; set type=string; end;")) unless cclir.nil?
+        cclir = config.dns
+        dservers = []
+        cclir['dns'].each do |ns|
+          dservers.append(ns['nameserver'])
+        end
+        uii.info(I18n.t('vagrant_zones.setting_cloud_resolvers')) unless dservers.nil?
+        uii.info("  #{dservers}") unless dservers.nil?
+        execute(false, %(#{zcfg}"add attr; set name=resolvers; set value=#{dservers}; set type=string; end;")) unless dservers.nil?
 
         ccisk = config.cloud_init_sshkey
         uii.info(I18n.t('vagrant_zones.setting_cloud_ssh_key')) unless ccisk.nil?
@@ -1061,13 +1062,13 @@ module VagrantPlugins
         zlogin(uii, 'rm -rf /etc/netplan/*.yaml')
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        servers = dnsservers(uii)
+        servers = dnsservers(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
         defrouter = opts[:gateway].to_s
         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[:dhcp]}\n      dhcp6: #{opts[:dhcp6]}\n)
+        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n)
         netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      gateway4: #{defrouter}\n)
         netplan4 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
         netplan = netplan1 + netplan2 + netplan3 + netplan4
@@ -1175,20 +1176,20 @@ module VagrantPlugins
             if zlogin_read.expect(/#{alcheck}/)
               uii.info(I18n.t('vagrant_zones.automated-zlogin-user'))
               zlogin_write.printf("#{user(@machine)}\n")
-              sleep(5)
+              sleep(config.login_wait)
             end
 
             if zlogin_read.expect(/#{pcheck}/)
               uii.info(I18n.t('vagrant_zones.automated-zlogin-pass'))
               zlogin_write.printf("#{vagrantuserpass(@machine)}\n")
-              sleep(10)
+              sleep(config.login_wait)
             end
 
             zlogin_write.printf("\n")
             if zlogin_read.expect(/#{lcheck}/)
               uii.info(I18n.t('vagrant_zones.automated-zlogin-root'))
               zlogin_write.printf("sudo su\n")
-              sleep(10)
+              sleep(config.login_wait)
               Process.kill('HUP', pid)
             end
           end
@@ -1252,7 +1253,7 @@ module VagrantPlugins
       def zoneniczloginsetup_windows(uii, opts, _mac)
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        servers = dnsservers(uii)
+        servers = dnsservers(uii, opts)
         defrouter = opts[:gateway].to_s
         uii.info(I18n.t('vagrant_zones.configure_win_interface_using_vnic'))
         sleep(60)

data/lib/vagrant-zones/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.41'
+    VERSION = '0.1.44'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.44
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n