vagrant-ovirt3 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04923cda3ffdd819d799a79f36f4eb95b32eca7f
-  data.tar.gz: 44f15f42bbcef3924ec8c8dc9be86b4425d33025
+  metadata.gz: 10e956175d14443a1c190093f60c29853797ce20
+  data.tar.gz: 524c422af0325672b8ad3f2eb45f36b010c060b8
 SHA512:
-  metadata.gz: 9aefea98057b34f65620423bb35593caddf0c786f58667cd75b644230086a96c070ce4ec3a87a3bebab70f65ed0e414c8b5570bb0988dced6bf6f4465bbcbc08
-  data.tar.gz: a6d6e45f7ef43f96217f9376769bd165c5bd59a9e93de0d4fa0dc9074c15587978db9d7df17cd35faa0809c8424415e05ee26fd52e24daa2441a9bb1313ebc5e
+  metadata.gz: d7864453b2709987db2e1296166206138bdd897f33c8be91c1e479d329b31fb31537f313ab0a2ae4f2739a67f3e671d4e6f3a471927f237566d11c7eb7239bec
+  data.tar.gz: 67081afe1cc7ea57feb4e3ab2b09301d7de5e7fa5836cb71c54df97f5e1ab0b3df8bcfb427506e775dbf76c2d6c23c9af67104782a5a8d08c3c84e15d5fbc515

data/README.md

@@ -41,6 +41,8 @@ Vagrant.configure('2') do |config|
     ovirt.username = 'username'
     ovirt.password = 'password'
     ovirt.datacenter = 'datacenter'
+    ovirt.quota = "e92124b9-22f4-4cef-bcd6-b9ae22155dcd"
+    ovirt.ca_no_verify = true
   end
 end
 ```
@@ -60,6 +62,7 @@ This provider exposes quite a few provider-specific configuration options:
   option will be replaced with `ca_cert` in a future version).
 * `ca_cert_file` - Like `ca_cert_store`, but provides a file containing a single
   certificate.
+* `quota` - The ID of the quota to use. This can be retrieved via the REST API
 
 ### Domain Specific Options
 

data/example_box/Vagrantfile

@@ -11,8 +11,9 @@ Vagrant.configure("2") do |config|
     ovirt.password = "secret"
     ovirt.datacenter = "Datacenter name"
     ovirt.template = "Template name"
-    ovirt.quota = "Quota name"
+    ovirt.quota = "e92124b9-22f4-4cef-bcd6-b9ae22155dcd"
     ovirt.cpus = 1
     ovirt.memory = 512
+    ovirt.ca_no_verify = true
   end
 end

data/lib/vagrant-ovirt3/action/create_vm.rb

@@ -17,9 +17,10 @@ module VagrantPlugins
           config = env[:machine].provider_config
 
           # Gather some info about domain
-          name = env[:domain_name]
+          name = config.name.nil? ? env[:domain_name] : config.name
           console = config.console
           cpus = config.cpus
+          quota = config.quota
           memory_size = config.memory*1024
           user_data = config.user_data ?
             Base64::encode64(config.user_data) :
@@ -67,6 +68,7 @@ module VagrantPlugins
           env[:ui].info(" -- Datacenter:    #{config.datacenter}")
           env[:ui].info(" -- Cluster:       #{cluster.name}")
           env[:ui].info(" -- Console:       #{console}")
+          env[:ui].info(" -- Quota:         #{quota}")
           if config.disk_size
             env[:ui].info(" -- Disk size:     #{config.disk_size}G")
           end
@@ -76,13 +78,14 @@ module VagrantPlugins
 
           # Create oVirt VM.
           attr = {
-              :name     => name,
-              :cores    => cpus,
-              :memory   => memory_size*1024,
-              :cluster  => cluster.id,
-              :template => template.id,
-              :display  => {:type => console },
+              :name      => name,
+              :cores     => cpus,
+              :memory    => memory_size*1024,
+              :cluster   => cluster.id,
+              :template  => template.id,
+              :display   => {:type => console },
               :user_data => user_data,
+              :quota     => quota,
           }
 
           begin

data/lib/vagrant-ovirt3/config.rb

@@ -19,6 +19,8 @@ module VagrantPlugins
       attr_accessor :console
       attr_accessor :disk_size
       attr_accessor :user_data
+      attr_accessor :name
+      attr_accessor :quota
 
       # TODO: change 'ca_cert_store' to 'ca_cert' once rbovirt PR #55 merges.
       attr_accessor :ca_no_verify
@@ -36,11 +38,13 @@ module VagrantPlugins
         # Domain specific settings.
         @memory     = UNSET_VALUE
         @cpus       = UNSET_VALUE
+        @quota      = UNSET_VALUE
         @template   = UNSET_VALUE
         @template_version = UNSET_VALUE
         @console    = UNSET_VALUE
         @disk_size  = UNSET_VALUE
         @user_data  = UNSET_VALUE
+        @name       = UNSET_VALUE
 
         @ca_no_verify = UNSET_VALUE
         @ca_cert_store = UNSET_VALUE
@@ -58,11 +62,13 @@ module VagrantPlugins
         # Domain specific settings.
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
+        @quota = nil if @quota == UNSET_VALUE
         @template = 'Blank' if @template == UNSET_VALUE
         @template_version = nil if @template_version == UNSET_VALUE
         @console = 'spice' if @console == UNSET_VALUE
         @disk_size = nil if @disk_size == UNSET_VALUE
         @user_data = nil if @user_data == UNSET_VALUE
+        @name = nil if @name == UNSET_VALUE
 
         @ca_no_verify = false if @ca_no_verify == UNSET_VALUE
         @ca_cert_store = nil if @ca_cert_store == UNSET_VALUE

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end
 

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.27'
 - !ruby/object:Gem::Dependency
   name: rbovirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.31
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant provider for oVirt and RHEV v3
@@ -65,7 +65,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -118,17 +118,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy