vagrant-zone 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c18117a8a3b345b488063565bc03e4778ae50dd4e21f09cd5309de2e043a66
-  data.tar.gz: 474569e09d7c50e88021065c28741c2326d6aa0d5fdafe0a6f1aae5cfc394a5f
+  metadata.gz: bdac02c4e9c3104f07c823aa4171bf31098eeba3f88180d5902ae7a384c7d166
+  data.tar.gz: 864c444150175f3f0cf18230dd3bce3b5f3ef2c6ba5ea0ba2fe80870c444006b
 SHA512:
-  metadata.gz: feec0720ba256d2f6b05495dee6df5c860336cf4749d7a9467891a3d36f01b7c92989bfa856493ea7012630ec7276899713dec53567e551d907cb886ce3166a4
-  data.tar.gz: 34a58b2d76e8fe2e6cde84ac567edf0fc478af356c0c9f8ed0b140a8b06ef4ebdab4e605e7cb5c1fd938f73ee4d12eb38af40d92a4f915caaa7f8d931394a2b3
+  metadata.gz: e74f6ab86b9cced168d8c057b1779f29c33e7e7927fc4755072d3b83f61bfcbccb067ca1dc12b67d23e9e759c0eedeaf7b9200a5896a4de2046bff9857f39cf3
+  data.tar.gz: 7badb35c222ff214926e76e0ad120b0859a8295cca95aad09b98de8214e8c3797abc50a13941a90d8149a4a1f258b4f543cd6fb32c260878a65645b0b87ad829

data/Vagrantfile

@@ -1,4 +1,17 @@
 Vagrant.configure("2") do |config|
+  config.vm.define :freebsd do |freebsd|
+    freebsd.vm.box = 'freebsd'
+
+    freebsd.vm.network "public_network",
+      ip: "192.168.122.30", bridge: "e1000g0", auto_config: false, :netmask => "255.255.255.0", gateway: "192.168.122.1"
+    
+    freebsd.vm.provider :zone do |vm|
+      vm.brand      = 'bhyve'
+      vm.zonepath   = '/rpool/freebsd'
+      vm.memory     = '512M'
+    end
+  end
+
   config.vm.define :debian do |debian|
     debian.vm.box        = 'debian.zss'
     debian.vm.network "public_network",
@@ -21,17 +34,18 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define :centos do |centos|
-    centos.vm.box        = '3dbbdcca-2eab-11e8-b925-23bf77789921'
+    centos.vm.box        = 'centos.zss'
     centos.vm.network "public_network",
       ip: "192.168.122.29", bridge: "e1000g0", auto_config: false, :netmask => "255.255.255.0", gateway: "192.168.122.1"
+
+    centos.vm.provision "shell", privileged: "true", inline: <<-SHELL
+      /native/sbin/zfs create -o mountpoint=/opt/db rpool/centos/data/db 
+    SHELL
   
-    centos.vm.provision "shell",
-      inline: "id > /home/vagrant/id"
-  
-    centos.vm.provision "ansible_local" do |ansible|
-      ansible.playbook = "playbook.yml"
-      ansible.install  = true
-    end
+ #   centos.vm.provision "ansible_local" do |ansible|
+ #     ansible.playbook = "playbook.yml"
+ #     ansible.install  = true
+ #   end
   
     centos.vm.provider :zone do |vm|
       vm.brand      = 'lx'

data/lib/vagrant-zone/action.rb

@@ -21,10 +21,9 @@ module VagrantPlugins
 							b2.use Network
 							b2.use Start
 							b2.use Setup
-							#b2.use PrepareNFSValidIds
-							#b2.use SyncedFolderCleanup
-							#b2.use SyncedFolders
 							b2.use WaitTillUp
+							b2.use SyncedFolderCleanup
+							b2.use SyncedFolders
 							b2.use Provision
 						else
 							env[:halt_on_error] = true

data/lib/vagrant-zone/action/create.rb

@@ -16,6 +16,7 @@ module VagrantPlugins
 					@driver  = @machine.provider.driver
 
 					@machine.id = SecureRandom.uuid
+					@driver.create_dataset(@machine, env[:ui])
 					@driver.zonecfg(@machine, env[:ui])
 					@driver.install(@machine, env[:ui])
 					@app.call(env)

data/lib/vagrant-zone/action/destroy.rb

@@ -15,6 +15,7 @@ module VagrantPlugins
 					@machine = env[:machine]
 					@driver  = @machine.provider.driver
 
+					@driver.delete_dataset(@machine, env[:ui])
 					@driver.destroy(@machine, env[:ui])
 					@app.call(env)
 				end

data/lib/vagrant-zone/action/setup.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
 				def call(env)
 					@machine = env[:machine]
 					@driver  = @machine.provider.driver
-
+					sleep 2
 					@driver.setup(@machine, env[:ui])
 					@app.call(env)
 				end

data/lib/vagrant-zone/driver.rb

@@ -4,6 +4,7 @@ require "digest/md5"
 require "io/console"
 require "ruby_expect"
 require 'netaddr'
+require "vagrant/util/numeric"
 
 module VagrantPlugins
 	module ProviderZone
@@ -54,9 +55,16 @@ module VagrantPlugins
 			end
 
 			def install(machine, ui)
+                                config = machine.provider_config
 				box  = @machine.data_dir.to_s + '/' + @machine.config.vm.box
 				name = @machine.name
-				execute(false, "#{@pfexec} zoneadm -z #{name} install -s #{box}")
+
+				if config.brand == 'lx'
+					execute(false, "#{@pfexec} zoneadm -z #{name} install -s #{box}")
+				end
+				if config.brand == 'bhyve'
+					execute(false, "#{@pfexec} zoneadm -z #{name} install")
+				end
 			end
 
 			def boot(machine, ui)
@@ -77,6 +85,27 @@ module VagrantPlugins
 				end
 			end
 
+			def create_dataset(machine, ui)
+				config  = machine.provider_config
+				dataset = config.zonepath.delete_prefix("/").to_s + "/data"
+				execute(false, "#{@pfexec} zfs create -o zoned=on -p #{dataset}")
+
+#				machine.config.vm.disks.each do |_type, opts|
+#					if _type.to_s = "disk"
+#						name = opts[:name] if !opts[:name].nil?
+#						size = Vagrant::Util::Numeric.string_to_bytes(opts[:size].to_s) if !opts[:size].nil?
+#						quota = "-o quota=" + size.to_s if size
+#
+#						execute(false, "#{@pfexec} zfs create #{quota} #{dataset}/#{name}")
+#					end
+#				end
+			end
+
+			def delete_dataset(machine, ui)
+				config = machine.provider_config
+				execute(false, "#{@pfexec} zfs destroy -r #{config.zonepath.delete_prefix("/")}/data")
+			end
+
 			def zonecfg(machine, ui)
 				config = machine.provider_config
 				machine.config.vm.networks.each do |_type, opts|
@@ -90,6 +119,34 @@ module VagrantPlugins
 				allowed_address  = @ip + @network.netmask.to_s
 				lofs_current_dir = Dir.pwd
 
+				attr = ''
+				if config.brand == 'lx'
+					attr = %{
+						add attr
+							set name=kernel-version
+							set type=string
+							set value=#{config.kernel}
+						end
+					}
+				end
+				if config.brand == 'bhyve'
+					attr = %{
+						add device
+							set match=/dev/zvol/rdsk#{config.zonepath}
+						end
+						add attr
+							set name=bootrom
+							set type=string
+							set value=BHYVE_RELEASE
+						end
+						add attr
+							set name=bootdisk
+							set type=string
+							set value=#{config.zonepath}
+						end
+					}
+				end
+
 				data = %{
 					create
 					set zonepath=#{config.zonepath}
@@ -102,21 +159,20 @@ module VagrantPlugins
 						add property (name=ips,value="#{allowed_address}")
 						add property (name=primary,value="true")
 					end
-					add attr
-						set name=kernel-version
-						set type=string
-						set value=#{config.kernel}
-					end
 					add capped-memory
 						set physical=#{config.memory}
 						set swap=#{config.memory}
 						set locked=#{config.memory}
 					end
+					#{attr}
 					add fs
 						set dir=/vagrant
 						set special=#{lofs_current_dir}
 						set type=lofs
 					end
+					add dataset
+						set name=#{config.zonepath.delete_prefix("/")}/data
+					end
 					set max-lwps=2000
 					exit
 				}

data/lib/vagrant-zone/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
 	module ProviderZone
-		VERSION = "0.0.1"
+		VERSION = "0.0.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zone
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Thomas Merkel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler