vagrant-zones 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a876da894bbf6fc4fe1e1ae0761b37af4d8977088fe82e67bd75d0e3af7c0c86
-  data.tar.gz: abfbdb4140d59fa23e2dd35755ed8391ddcc6376ee6fd726130ca9d894b3e4d3
+  metadata.gz: b51ba5c43caff9de4276241efbdbbb266bc9f6b67578e828053d96248e83ce62
+  data.tar.gz: 906ac3a396962c04c1e1cce41f443bc04daa5af38430d4e3d6413855487bc1c4
 SHA512:
-  metadata.gz: 3ec7973c3121f41ca77ba23ffadc02bcb1c701d6f75529e8ba469c8e62d3b335dd6d356f133d133bd2359e69de091bf593ff502952a076fd669cd5516371288e
-  data.tar.gz: 25cc72ff54a1ac5505ac363b875a6e9c3414bc81313125f1efac625da03508185e4c57c4ed8f6d88beefe8487fedadb40453b4ca804cbdbb37b0553dd8528e08
+  metadata.gz: 6f7f30ac93cc24cb6deb21787f03a45861419033ca63e7311e7dc3e0d05572314d1617f1e4e449bd783b53851927fdbf9b022dc4094cf85907d8ec92236958a1
+  data.tar.gz: 9e674d3c31c5caabd952f7ad7088c5e6e2d8400fdf044a10cb32cf0be3f38071aae5e8ed438b61e99a8212e0079287ad051e502ce23d80df0caac61e8cae01b8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### [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)
 
 

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 = 4
         @cloud_init_enabled = false
         @cloud_init_conf = 'on'
         @cloud_init_dnsdomain = nil

data/lib/vagrant-zones/driver.rb

@@ -211,13 +211,9 @@ module VagrantPlugins
       end
 
       # This Sanitizes the DNS Records
-      def dnsservers(uii)
-        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?
+      def dnsservers(uii, opts)
+        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 +266,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 +287,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 +504,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 +529,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,7 +972,7 @@ 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
+        cclir = config.dns
         dservers = []
         cclir['dns'].each do |ns|
           dservers.append(ns['nameserver'])
@@ -1065,13 +1061,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
@@ -1179,20 +1175,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
@@ -1256,7 +1252,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.9'
+    VERSION = '0.1.10'
   end
 end

metadata

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