inprovise-vbox 0.2.16 → 0.2.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/inprovise/vbox/vbox.rb +34 -7
- data/lib/inprovise/vbox/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1ed88c13e35e5e157df0b632dba66227d15dcf76198c237da19b43d5694b0ba5
|
|
4
|
+
data.tar.gz: e40bd3182975382bf197b866c6245df825cd950340ead1339d76f3e3b5ab8ccf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 886324432ec7f90eb92413b21fa2cc86ee9c7b93d0c544ec764de0e6d97e201ff4ff865032602707385e6dbd29191bee15028c39558bef6d132fd1b5826b87e2
|
|
7
|
+
data.tar.gz: 7275e2819127358c7c92ea62378763c2a92a0a34c9a2c2dca716853899b7d9ada607dec3b0ac23406ff33aaf871d1849440fbc719fca136b9feee356737da4d7
|
data/README.md
CHANGED
data/lib/inprovise/vbox/vbox.rb
CHANGED
|
@@ -41,7 +41,8 @@ module Inprovise::VBox
|
|
|
41
41
|
cmdline = "virt-install --connect qemu:///system --hvm --virt-type #{cfg[:virt_type] || 'kvm'} --import --wait 0 "
|
|
42
42
|
cmdline << "--arch #{cfg[:arch]} "
|
|
43
43
|
cmdline << '--autostart ' if cfg[:autostart]
|
|
44
|
-
cmdline << "--name #{vboxname} --memory #{cfg[:memory]}
|
|
44
|
+
cmdline << "--name #{vboxname} --memory #{cfg[:memory]} "
|
|
45
|
+
cmdline << "--cpu #{cfg[:cpu_model]},topology.sockets=#{cfg[:cpu_sockets]},topology.cores=#{cfg[:cpu_cores]},topology.threads=#{cfg[:cpu_threads]} "
|
|
45
46
|
# check if os variant defined on this host
|
|
46
47
|
if cfg[:os]
|
|
47
48
|
os_variant = sudo("osinfo-query --fields=short-id os | grep #{cfg[:os]}").strip
|
|
@@ -85,7 +86,10 @@ module Inprovise::VBox
|
|
|
85
86
|
# :memory
|
|
86
87
|
# :cdrom
|
|
87
88
|
# :cdrombus
|
|
88
|
-
# :
|
|
89
|
+
# :cpu_model
|
|
90
|
+
# :cpu_sockets
|
|
91
|
+
# :cpu_cores
|
|
92
|
+
# :cpu_threads
|
|
89
93
|
# :os
|
|
90
94
|
# :network
|
|
91
95
|
# :netname
|
|
@@ -106,7 +110,10 @@ module Inprovise::VBox
|
|
|
106
110
|
@configuration ||= Inprovise::Config.new
|
|
107
111
|
@configuration[:arch] ||= 'x86_64'
|
|
108
112
|
@configuration[:memory] ||= 1024
|
|
109
|
-
@configuration[:
|
|
113
|
+
@configuration[:cpu_model] ||= 'host-model'
|
|
114
|
+
@configuration[:cpu_sockets] ||= 1
|
|
115
|
+
@configuration[:cpu_cores] ||= 2
|
|
116
|
+
@configuration[:cpu_threads] ||= 1
|
|
110
117
|
@configuration[:network] ||= :hostnet
|
|
111
118
|
# generate name if none set
|
|
112
119
|
@configuration[:name] ||= "#{name}_#{self.hash}_#{Time.now.to_f}"
|
|
@@ -143,10 +150,14 @@ module Inprovise::VBox
|
|
|
143
150
|
:arch => vbs.vbox_arch(self),
|
|
144
151
|
:autostart => vbs.vbox_autostart(self),
|
|
145
152
|
:memory => vbs.vbox_memory(self),
|
|
146
|
-
:
|
|
153
|
+
:cpu_model => vbs.vbox_cpu_model(self),
|
|
154
|
+
:cpu_sockets => vbs.vbox_cpu_sockets(self),
|
|
155
|
+
:cpu_cores => vbs.vbox_cpu_cores(self),
|
|
156
|
+
:cpu_threads => vbs.vbox_cpu_threads(self),
|
|
147
157
|
:os => vbs.vbox_os(self),
|
|
148
158
|
:network => vbs.vbox_network(self) || :hostnet,
|
|
149
159
|
:netname => vbs.vbox_netname(self),
|
|
160
|
+
:source=> vbs.vbox_source(self),
|
|
150
161
|
:nic => vbs.vbox_nic(self),
|
|
151
162
|
:graphics => vbs.vbox_graphics(self),
|
|
152
163
|
:image => vbs.vbox_image(self),
|
|
@@ -221,7 +232,7 @@ module Inprovise::VBox
|
|
|
221
232
|
end
|
|
222
233
|
end
|
|
223
234
|
log.println("#{msg}done", :bold)
|
|
224
|
-
raise RuntimeError, "Failed to
|
|
235
|
+
raise RuntimeError, "Failed to determine IP address for VBox #{vmname}" unless addr
|
|
225
236
|
log("VBox #{vmname} : mac=#{mac}, addr=#{addr}") if Inprovise.verbosity > 0
|
|
226
237
|
vbox_opts = vbs.vbox_config_hash(self)
|
|
227
238
|
vbox_opts.delete(:no_node)
|
|
@@ -329,8 +340,20 @@ module Inprovise::VBox
|
|
|
329
340
|
value_for context, context.config[name.to_sym][:memory]
|
|
330
341
|
end
|
|
331
342
|
|
|
332
|
-
def
|
|
333
|
-
value_for context, context.config[name.to_sym][:
|
|
343
|
+
def vbox_cpu_model
|
|
344
|
+
value_for context, context.config[name.to_sym][:cpu_model]
|
|
345
|
+
end
|
|
346
|
+
|
|
347
|
+
def vbox_cpu_sockets
|
|
348
|
+
value_for context, context.config[name.to_sym][:cpu_sockets]
|
|
349
|
+
end
|
|
350
|
+
|
|
351
|
+
def vbox_cpu_cores
|
|
352
|
+
value_for context, context.config[name.to_sym][:cpu_cores]
|
|
353
|
+
end
|
|
354
|
+
|
|
355
|
+
def vbox_cpu_threads
|
|
356
|
+
value_for context, context.config[name.to_sym][:cpu_threads]
|
|
334
357
|
end
|
|
335
358
|
|
|
336
359
|
def vbox_network(context)
|
|
@@ -341,6 +364,10 @@ module Inprovise::VBox
|
|
|
341
364
|
value_for context, context.config[name.to_sym][:netname]
|
|
342
365
|
end
|
|
343
366
|
|
|
367
|
+
def vbox_source(context)
|
|
368
|
+
value_for context, context.config[name.to_sym][:source]
|
|
369
|
+
end
|
|
370
|
+
|
|
344
371
|
def vbox_nic(context)
|
|
345
372
|
value_for context, context.config[name.to_sym][:nic]
|
|
346
373
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: inprovise-vbox
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.18
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Johnny Willemsen
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-12-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: inprovise
|