vagrant-proxmox 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vagrant-proxmox/action/create_vm.rb +5 -5
- data/lib/vagrant-proxmox/config.rb +33 -0
- data/lib/vagrant-proxmox/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 50fcfd510ddb0e1f43e6a95d0247c236ea42fdec
|
4
|
+
data.tar.gz: 9b92370c07abe2d0d97d8fec096e375ec30ef29b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d40ea752d5c8bf0e8ef6b9386c9a17805e48d84b8118654fd601dc6c64768fdbeceda58014f9eca43fc87282d87a1b9591e2d4fdaa9794a5ad79d174e01936b5
|
7
|
+
data.tar.gz: 95c7d2f1e2d4c429f75389500962d6a3640f91ea351dc6b47aafac3f9401105f8193abd8bd4ec16a62177ec8f8ff4b83725d73a2f5d0dd7b0e79571797ec9518
|
@@ -36,15 +36,15 @@ module VagrantPlugins
|
|
36
36
|
|
37
37
|
private
|
38
38
|
def create_params_qemu(config, env, vm_id)
|
39
|
-
network =
|
40
|
-
network = "
|
39
|
+
network = "#{config.qemu_nic_model},bridge=#{config.qemu_bridge}"
|
40
|
+
network = "#{config.qemu_nic_model}=#{get_machine_macaddress(env)},bridge=#{config.qemu_bridge}" if get_machine_macaddress(env)
|
41
41
|
{vmid: vm_id,
|
42
42
|
name: env[:machine].config.vm.hostname || env[:machine].name.to_s,
|
43
43
|
ostype: config.qemu_os,
|
44
44
|
ide2: "#{config.qemu_iso},media=cdrom",
|
45
|
-
sata0: "
|
46
|
-
sockets:
|
47
|
-
cores:
|
45
|
+
sata0: "#{config.qemu_storage}:#{config.qemu_disk_size},format=qcow2",
|
46
|
+
sockets: config.qemu_sockets,
|
47
|
+
cores: config.qemu_cores,
|
48
48
|
memory: config.vm_memory,
|
49
49
|
net0: network,
|
50
50
|
description: "#{config.vm_name_prefix}#{env[:machine].name}"}
|
@@ -82,6 +82,16 @@ module VagrantPlugins
|
|
82
82
|
# @return [Symbol]
|
83
83
|
attr_accessor :qemu_os
|
84
84
|
|
85
|
+
# The number of cores per socket
|
86
|
+
#
|
87
|
+
# @return [Integer]
|
88
|
+
attr_accessor :qemu_cores
|
89
|
+
|
90
|
+
# The number of CPU sockets
|
91
|
+
#
|
92
|
+
# @return [Integer]
|
93
|
+
attr_accessor :qemu_sockets
|
94
|
+
|
85
95
|
# The qemu iso file to use for the virtual machine
|
86
96
|
#
|
87
97
|
# @return [String]
|
@@ -97,6 +107,24 @@ module VagrantPlugins
|
|
97
107
|
# @return [String]
|
98
108
|
attr_accessor :qemu_disk_size
|
99
109
|
|
110
|
+
# The qemu storage to use for the virtual machine, e.g. 'local', 'raid', 'cephstore'
|
111
|
+
# defaults to 'raid' for backwards compatability
|
112
|
+
#
|
113
|
+
# @return [String]
|
114
|
+
attr_accessor :qemu_storage
|
115
|
+
|
116
|
+
# The qemu network interface card model, e.g. 'e1000', 'virtio'
|
117
|
+
# defaults to 'e1000' for backwards compatability
|
118
|
+
#
|
119
|
+
# @return [String]
|
120
|
+
attr_accessor :qemu_nic_model
|
121
|
+
|
122
|
+
# The qemu network bridge, e.g. 'vmbr0'
|
123
|
+
# defaults to 'vmbr0' for backwards compatability
|
124
|
+
#
|
125
|
+
# @return [String]
|
126
|
+
attr_accessor :qemu_bridge
|
127
|
+
|
100
128
|
def initialize
|
101
129
|
@endpoint = UNSET_VALUE
|
102
130
|
@selected_node = UNSET_VALUE
|
@@ -114,9 +142,14 @@ module VagrantPlugins
|
|
114
142
|
@ssh_status_check_interval = 5
|
115
143
|
@imgcopy_timeout = 120
|
116
144
|
@qemu_os = UNSET_VALUE
|
145
|
+
@qemu_cores = 1
|
146
|
+
@qemu_sockets = 1
|
117
147
|
@qemu_iso = UNSET_VALUE
|
118
148
|
@qemu_iso_file = UNSET_VALUE
|
119
149
|
@qemu_disk_size = UNSET_VALUE
|
150
|
+
@qemu_storage = 'raid'
|
151
|
+
@qemu_nic_model = 'e1000'
|
152
|
+
@qemu_bridge = 'vmbr0'
|
120
153
|
end
|
121
154
|
|
122
155
|
# This is the hook that is called to finalize the object before it is put into use.
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-proxmox
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dirk Grappendorf
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2015-
|
13
|
+
date: 2015-05-26 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rest-client
|