vagrant-zones 0.1.82 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd64fc86cb10963251311de30fcda77a27a627391457e9f5780a106dd247c3d5
-  data.tar.gz: 5f4939556bcf17c488a5e8c375a6230f234057226b38419c5b2c3ae7e14ee7c2
+  metadata.gz: ce01cac168233025a31a5c278f6355411796b26718d760d2ed076643af1b486c
+  data.tar.gz: 4f3318fc4e57712bce3a076a5786329ff49d9203ada2df45a6874b8013e8f144
 SHA512:
-  metadata.gz: 03b893f25862c421061d6e3b0af5b638c910a554839961aec3a7582be6505143ebf69e7e467e0b50a4cd3cf97f8c2d18fb9907d05ef5d8b756aebc09a014834e
-  data.tar.gz: 410fc3fcd792482ce8859215d1d50497dd439c1d405027a29e58380a5bac03ce246a118bd9201aa80705d975f37d4b06529bc5e4d5e823c8447502ce9092d89f
+  metadata.gz: 660ab29d0b22a305f365ec65871ad00207044e343c7b93f091580398332f39e31c7f7d851f75a2ef312984b30e5b844fd53e2350c111ad1ede7518ad88e400bf
+  data.tar.gz: a598f65dd8cf0efb3aa104fb44b995732b664d900b17208cf934bfa4fec9179777bd829d991a4f9661a05308f583fde9093d01682fbf5024dd38026ce855b7a0

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.1.84](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.83...v0.1.84) (2023-12-14)
+
+
+### Bug Fixes
+
+* adding removal of zonecfg provisional network after startup ([8885044](https://github.com/STARTcloud/vagrant-zones/commit/88850440213a7ffce82463b02dab56c8c9d05d69))
+* disable parallel by default ([98de187](https://github.com/STARTcloud/vagrant-zones/commit/98de187ab53a123a95d489a4bd8f7383d1b788ca))
+* enable parallel builds #dangerwillrobinson ([5bf2cea](https://github.com/STARTcloud/vagrant-zones/commit/5bf2ceaf3adaf42553afe7a38ab9c2a665d7ff21))
+* remove unneccessary lines from zonenicdel ([39fef96](https://github.com/STARTcloud/vagrant-zones/commit/39fef96b85445c472595154ebb59db8f190a30c4))
+* remove unneccessary lines from zonenicdel ([227ab2c](https://github.com/STARTcloud/vagrant-zones/commit/227ab2cdb06eb8a414b2f13e567f6be70ac8613c))
+* renenable parallel ([38c2bf2](https://github.com/STARTcloud/vagrant-zones/commit/38c2bf27e905f8a4099532fa3d193d3825d4ab95))
+* some rubocop warnings ([88b00c4](https://github.com/STARTcloud/vagrant-zones/commit/88b00c465a3926aa0ce4dc8881592fd755dfd5dc))
+* typo  ) ([b385505](https://github.com/STARTcloud/vagrant-zones/commit/b385505757ac5e078522add1e3e44b99c9369417))
+* windows multiple nameservers ([430be2d](https://github.com/STARTcloud/vagrant-zones/commit/430be2d868be34a9724b454ff571006c7632df7a))
+* windows namservers ([b271ae1](https://github.com/STARTcloud/vagrant-zones/commit/b271ae1dbb436750cb4b074f99d10f5922c0ee0c))
+
+## [0.1.83](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.82...v0.1.83) (2023-12-12)
+
+
+### Bug Fixes
+
+* add specific routing to netplan configs ([c4619d8](https://github.com/STARTcloud/vagrant-zones/commit/c4619d8efab3e85c10bba2caaa26e20620bde788))
+
 ## [0.1.82](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.81...v0.1.82) (2023-12-12)
 
 

data/lib/vagrant-zones/action/network_cleanup.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'log4r'
+require 'securerandom'
+require 'digest/md5'
+
+module VagrantPlugins
+  module ProviderZone
+    module Action
+      # This is use to define the network
+      class NetworkingCleanup
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_zones::action::import')
+          @app = app
+        end
+
+        def call(env)
+          @machine = env[:machine]
+          @driver  = @machine.provider.driver
+          @driver.network(env[:ui], 'delete_provisional')
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-zones/action.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
               b2.use WaitTillBoot
               b2.use Setup
               b2.use WaitTillUp
+              b2.use NetworkingCleanup
               b2.use Provision
               b2.use SetHostname
               b2.use SyncedFolders
@@ -186,6 +187,7 @@ module VagrantPlugins
       autoload :Network, action_root.join('network')
       autoload :Setup, action_root.join('setup')
       autoload :Start, action_root.join('start')
+      autoload :NetworkingCleanup, action_root.join('network_cleanup')
       autoload :IsCreated, action_root.join('is_created')
       autoload :NotCreated, action_root.join('not_created')
       autoload :CreateSnapshots, action_root.join('create_zfs_snapshots')

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, :on_demand_vnics, :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
+      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :post_provision_boot, :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, :on_demand_vnics, :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
 
@@ -16,6 +16,7 @@ module VagrantPlugins
         @brand = 'bhyve'
         @additional_disks = UNSET_VALUE
         @autoboot = true
+        @post_provision_boot = false
         @kernel = UNSET_VALUE
         @boxshortname = UNSET_VALUE
         @cdroms = nil

data/lib/vagrant-zones/driver.rb

@@ -321,6 +321,7 @@ module VagrantPlugins
           when 'public_network'
             zonenicdel(uii, opts) if state == 'delete' && !config.on_demand_vnics
             zonecfgnicconfig(uii, opts) if state == 'config'
+            zonecfgnicconfigdelete(uii, opts) if state == 'delete_provisional' && config.on_demand_vnics
             zoneniccreate(uii, opts) if state == 'create' && !config.on_demand_vnics
             zonenicstpzloginsetup(uii, opts, config) if state == 'setup' && config.setup_method == 'zlogin'
           when 'private_network'
@@ -526,7 +527,7 @@ module VagrantPlugins
         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)
-        netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      routes:\n        - to: default\n          via: #{defrouter}\n)
+        netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      routes:\n        - to: #{opts[:route]}\n          via: #{defrouter}\n)
         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"
@@ -1075,6 +1076,14 @@ module VagrantPlugins
         end
       end
 
+      ## zonecfg function for for Networking
+      def zonecfgnicconfigdelete(uii, opts)
+        vnic_name = vname(uii, opts)
+        uii.info(I18n.t('vagrant_zones.vnic_conf_del'))
+        uii.info(" #{vnic_name}")
+        execute(false, "#{@pfexec} zonecfg -z #{@machine.name} remove net physical=#{vnic_name}") if opts[:provisional]
+      end
+
       # This helps us set the zone configurations for the zone
       def zonecfg(uii)
         name = @machine.name
@@ -1143,7 +1152,7 @@ module VagrantPlugins
         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 = %(      routes:\n        - to: default\n          via: #{defrouter}\n)
+        netplan4 = %(      routes:\n        - to: #{opts[:route]}\n          via: #{defrouter}\n)
         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?
@@ -1327,7 +1336,6 @@ module VagrantPlugins
       def zoneniczloginsetup_windows(uii, opts, _mac)
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        servers = dnsservers(uii, opts) unless opts[:dns].nil?
         defrouter = opts[:gateway].to_s
         uii.info(I18n.t('vagrant_zones.configure_win_interface_using_vnic'))
         sleep(60)
@@ -1336,13 +1344,17 @@ module VagrantPlugins
         ## to set the proper VNIC name if using multiple adapters
         rename_adapter = %(netsh interface set interface name = "Ethernet" newname = "#{vnic_name}")
         cmd = %(netsh interface ipv4 set address name="#{vnic_name}" static #{ip} #{opts[:netmask]} #{defrouter})
-        dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{servers[0]['nameserver']} primary validate=no) unless opts[:dns].nil?
-        dns2 = %(netsh int ipv4 add dns name="#{vnic_name}" #{servers[1]['nameserver']} index=2 validate=no) unless opts[:dns].nil?
-
         uii.info(I18n.t('vagrant_zones.win_applied_rename_adapter')) if zlogin(uii, rename_adapter)
         uii.info(I18n.t('vagrant_zones.win_applied_static')) if zlogin(uii, cmd)
+        return unless opts[:dns].nil?
+
+        ip_addresses = dnsservers(uii, opts).map { |hash| hash['nameserver'] }
+        dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{ip_addresses[0]} primary validate=no)
         uii.info(I18n.t('vagrant_zones.win_applied_dns1')) if zlogin(uii, dns1)
-        uii.info(I18n.t('vagrant_zones.win_applied_dns2')) if zlogin(uii, dns2)
+        ip_addresses[1..].each_with_index do |dns, index|
+          additional_nameservers = %(netsh int ipv4 add dns name="#{vnic_name}" #{dns} index="#{index + 2}" validate=no)
+          uii.info(I18n.t('vagrant_zones.win_applied_dns2')) if zlogin(uii, additional_nameservers)
+        end
       end
 
       def zlogin_win_boot(uii)

data/lib/vagrant-zones/plugin.rb

@@ -20,9 +20,7 @@ module VagrantPlugins
         require_relative 'config'
         Config
       end
-      ## Experimental Parallel Execucution
-      ## provider(:zone, parallel: true) do
-      provider(:zone) do
+      provider(:zone, parallel: false) do
         require_relative 'provider'
         Provider
       end

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.82'
+    VERSION = '0.1.84'
     NAME = 'vagrant-zones'
   end
 end

data/locales/en.yml

@@ -256,6 +256,8 @@ en:
       Creating networking interfaces for zone: 
     nat_vnic_setup: |-
       - Setting up NAT VNIC: 
+    vnic_conf_del: |-
+      -  Deleting zonecg for provisional VNIC: 
     forwarding_nat: |-
       - Enabling NAT forwarding:
     configuring_nat: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.82
+  version: 0.1.84
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -132,6 +132,7 @@ files:
 - lib/vagrant-zones/action/import.rb
 - lib/vagrant-zones/action/is_created.rb
 - lib/vagrant-zones/action/network.rb
+- lib/vagrant-zones/action/network_cleanup.rb
 - lib/vagrant-zones/action/not_created.rb
 - lib/vagrant-zones/action/package.rb
 - lib/vagrant-zones/action/prepare_nfs_valid_ids.rb