vagrant-ovirt3 1.6.2 → 1.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -0
  3. data/lib/vagrant-ovirt3/action/create_vm.rb +23 -18
  4. data/lib/vagrant-ovirt3/config.rb +12 -9
  5. data/lib/vagrant-ovirt3/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d3fa40f4c2d82e0166596e1236ff692ddf8908c3
4
- data.tar.gz: 9236f514c7f479a39d4d9c32d0c025b3edd5ed80
3
+ metadata.gz: 0fe773d0fcd94c5ec802c016f7abfb522ca5d2cb
4
+ data.tar.gz: 03eb7a423abc325874d1934a504cc2a900ee7be8
5
5
  SHA512:
6
- metadata.gz: 6f954f92eca2c25f35317707bd9dcb13d14dd660473c5f187ab0168c335e51829edc9356e7603c2cb8074f95e8835d1e378eae5e13d033eada8386f229e47876
7
- data.tar.gz: f67b4d906ceebfcdabb01b6c7fafa57d3d3eeeec7bb26c929cb552f886765feac5adc36b9d406a97d820fa810dde1f509b7bd01a720bde150c128bb18199bd2c
6
+ metadata.gz: 46ffc9bb0b88ea622a378e197c250677b8f92c6fa677697114908e64e64306ddcf3da90d18de977ceafd6f46c50a55d13866122b7ec7c6a313af68a3796b1ca9
7
+ data.tar.gz: 3f9a1ddb15a0d6cd8e945d5dfa12a1584248d5e0e2e00f0a78d2be4c108ba6d149b9795c14a28f89426e86ad4953bbc604b855703d8d79ed414e76577098b202
data/README.md CHANGED
@@ -43,6 +43,7 @@ Vagrant.configure('2') do |config|
43
43
  ovirt.datacenter = 'datacenter'
44
44
  ovirt.quota = "e92124b9-22f4-4cef-bcd6-b9ae22155dcd"
45
45
  ovirt.ca_no_verify = true
46
+ ovirt.memory_guaranteed = 2048 # Supported by oVirt 3.6 and above only
46
47
  end
47
48
  end
48
49
  ```
@@ -63,6 +64,7 @@ This provider exposes quite a few provider-specific configuration options:
63
64
  * `ca_cert_file` - Like `ca_cert_store`, but provides a file containing a single
64
65
  certificate.
65
66
  * `quota` - The ID of the quota to use. This can be retrieved via the REST API
67
+ * `memory_guaranteed` - The amount of memory guaranteed to the VM. *Supported by oVirt 3.6 and above only*
66
68
 
67
69
  ### Domain Specific Options
68
70
 
data/lib/vagrant-ovirt3/action/create_vm.rb CHANGED
@@ -20,6 +20,7 @@ module VagrantPlugins
20
20
  name = (config.name.nil? ? env[:domain_name] : config.name)[0,15]
21
21
  console = config.console
22
22
  cpus = config.cpus
23
+ memory_guaranteed_size = config.memory_guaranteed ? config.memory_guaranteed*1024 : nil
23
24
  quota = config.quota
24
25
  memory_size = config.memory*1024
25
26
  user_data = config.user_data ?
@@ -60,19 +61,22 @@ module VagrantPlugins
60
61
 
61
62
  # Output the settings we're going to use to the user
62
63
  env[:ui].info(I18n.t("vagrant_ovirt3.creating_vm"))
63
- env[:ui].info(" -- Name: #{name}")
64
- env[:ui].info(" -- Cpus: #{cpus}")
65
- env[:ui].info(" -- Memory: #{memory_size/1024}M")
66
- env[:ui].info(" -- Template: #{template.name}")
67
- env[:ui].info(" -- Version: #{version_string}")
68
- env[:ui].info(" -- Datacenter: #{config.datacenter}")
69
- env[:ui].info(" -- Cluster: #{cluster.name}")
70
- env[:ui].info(" -- Console: #{console}")
64
+ env[:ui].info(" -- Name: #{name}")
65
+ env[:ui].info(" -- Cpus: #{cpus}")
66
+ env[:ui].info(" -- Memory: #{memory_size/1024}M")
67
+ env[:ui].info(" -- Template: #{template.name}")
68
+ env[:ui].info(" -- Version: #{version_string}")
69
+ env[:ui].info(" -- Datacenter: #{config.datacenter}")
70
+ env[:ui].info(" -- Cluster: #{cluster.name}")
71
+ env[:ui].info(" -- Console: #{console}")
72
+ if memory_guaranteed_size
73
+ env[:ui].info(" -- Memory Guaranteed: #{memory_guaranteed_size/1024}M")
74
+ end
71
75
  if quota
72
- env[:ui].info(" -- Quota: #{quota}")
76
+ env[:ui].info(" -- Quota: #{quota}")
73
77
  end
74
78
  if config.disk_size
75
- env[:ui].info(" -- Disk size: #{config.disk_size}G")
79
+ env[:ui].info(" -- Disk size: #{config.disk_size}G")
76
80
  end
77
81
  if config.user_data
78
82
  env[:ui].info(" -- User data:\n#{config.user_data}")
@@ -80,14 +84,15 @@ module VagrantPlugins
80
84
 
81
85
  # Create oVirt VM.
82
86
  attr = {
83
- :name => name,
84
- :cores => cpus,
85
- :memory => memory_size*1024,
86
- :cluster => cluster.id,
87
- :template => template.id,
88
- :display => {:type => console },
89
- :user_data => user_data,
90
- :quota => quota,
87
+ :name => name,
88
+ :cores => cpus,
89
+ :memory => memory_size*1024,
90
+ :cluster => cluster.id,
91
+ :template => template.id,
92
+ :display => {:type => console },
93
+ :user_data => user_data,
94
+ :quota => quota,
95
+ :memory_guaranteed => memory_guaranteed_size,
91
96
  }
92
97
 
93
98
  begin
data/lib/vagrant-ovirt3/config.rb CHANGED
@@ -13,6 +13,7 @@ module VagrantPlugins
13
13
 
14
14
  # Domain specific settings used while creating new machine.
15
15
  attr_accessor :memory
16
+ attr_accessor :memory_guaranteed
16
17
  attr_accessor :cpus
17
18
  attr_accessor :template
18
19
  attr_accessor :template_version
@@ -36,15 +37,16 @@ module VagrantPlugins
36
37
  @filtered_api = UNSET_VALUE
37
38
 
38
39
  # Domain specific settings.
39
- @memory = UNSET_VALUE
40
- @cpus = UNSET_VALUE
41
- @quota = UNSET_VALUE
42
- @template = UNSET_VALUE
43
- @template_version = UNSET_VALUE
44
- @console = UNSET_VALUE
45
- @disk_size = UNSET_VALUE
46
- @user_data = UNSET_VALUE
47
- @name = UNSET_VALUE
40
+ @memory = UNSET_VALUE
41
+ @memory_guaranteed = UNSET_VALUE
42
+ @cpus = UNSET_VALUE
43
+ @quota = UNSET_VALUE
44
+ @template = UNSET_VALUE
45
+ @template_version = UNSET_VALUE
46
+ @console = UNSET_VALUE
47
+ @disk_size = UNSET_VALUE
48
+ @user_data = UNSET_VALUE
49
+ @name = UNSET_VALUE
48
50
 
49
51
  @ca_no_verify = UNSET_VALUE
50
52
  @ca_cert_store = UNSET_VALUE
@@ -61,6 +63,7 @@ module VagrantPlugins
61
63
 
62
64
  # Domain specific settings.
63
65
  @memory = 512 if @memory == UNSET_VALUE
66
+ @memory_guaranteed = nil if @memory_guaranteed == UNSET_VALUE
64
67
  @cpus = 1 if @cpus == UNSET_VALUE
65
68
  @quota = nil if @quota == UNSET_VALUE
66
69
  @template = 'Blank' if @template == UNSET_VALUE
data/lib/vagrant-ovirt3/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module VagrantPlugins
2
2
  module OVirtProvider
3
- VERSION = '1.6.2'
3
+ VERSION = '1.7.0'
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-ovirt3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.2
4
+ version: 1.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marcus Young
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-25 00:00:00.000000000 Z
11
+ date: 2016-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fog