vagrant-ovirt3 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2c3c06ee37413d725caa7ed7d96e3a4520bce7
-  data.tar.gz: 07a489d90c737aa6bf7fc3953e5c75699af3b0f7
+  metadata.gz: 7a83e94bc6b24b236e3c6c7191d9e037571c3a3d
+  data.tar.gz: ff0be34d9bfd92cce4eccf98e9b9d7d37c1da69a
 SHA512:
-  metadata.gz: ff9a450bad643033edaeddca60e72b4406ce50a368ca7dd400827b6e092795f2f0dcfcbc3d5bbde92dbb141a30976f3a18dba2f0149185a529f088a4dd43246f
-  data.tar.gz: 27add50d6252ba1a660de93bc8973bcc493ab070242207c4f86790988a91b7ea61bce7f01af4ebf9f50c00abfcfe9d85736d7f7f427e7639c5f0073b78acb2a1
+  metadata.gz: 178635096f3a5897e9d98dcb50aaecde1b01dfe1318ebc2438d70006f4e4b58a4e69844dd3828929ec4b2c0fbc47b593d2228d00f7daf9c3e7ae439a2e01c703
+  data.tar.gz: 17f4844ddbb87b807fce768b1924e82399e744582c094a803277148ca41af4c894998d94e37ad93b563bab0a6a2ad8154fac32a56b1431960961b7a997de91ac

data/README.md

@@ -8,6 +8,9 @@ allowing Vagrant to control and provision machines in oVirt and RHEV.
 In this document, both oVirt and RHEV names are used interchangeably and
 represent the same platform on top of which this provider should work.
 
+## Version 1.1.2
+* Added missing certificate options and fixed usage on `ca_no_verify`
+
 ## Version 1.1.1
 * Added missing locales
 * Fixed box url in usage

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

@@ -34,6 +34,8 @@ module VagrantPlugins
           conn_attr[:ovirt_username] = config.username if config.username
           conn_attr[:ovirt_password] = config.password if config.password
           conn_attr[:ovirt_ca_no_verify] = config.ca_no_verify if config.ca_no_verify
+          conn_attr[:ovirt_ca_cert_store] = config.ca_cert_store if config.ca_cert_store
+          conn_attr[:ovirt_ca_cert_file] = config.ca_cert_file if config.ca_cert_file
 
           # We need datacenter id in fog connection initialization. But it's
           # much simpler to use datacenter name in Vagrantfile. So get
@@ -76,7 +78,10 @@ module VagrantPlugins
             credentials[:ovirt_password],
             credentials[:ovirt_url],
             { :datacenter_id => credentials[:ovirt_datacenter],
-              :ca_no_verify => credentials[:ovirt_ca_no_verify] }
+              :ca_no_verify => credentials[:ovirt_ca_no_verify],
+              :ca_cert_store => credentials[:ovirt_ca_cert_store],
+              :ca_cert_file => credentials[:ovirt_ca_cert_file]
+            }
           )
         end
       end

data/lib/vagrant-ovirt3/config.rb

@@ -17,6 +17,11 @@ module VagrantPlugins
       attr_accessor :console
       attr_accessor :disk_size
 
+      # TODO: change 'ca_cert_store' to 'ca_cert' once rbovirt PR #55 merges.
+      attr_accessor :ca_no_verify
+      attr_accessor :ca_cert_store
+      attr_accessor :ca_cert_file
+
       def initialize
         @url            = UNSET_VALUE
         @username       = UNSET_VALUE
@@ -32,6 +37,8 @@ module VagrantPlugins
         @disk_size  = UNSET_VALUE
 
         @ca_no_verify = UNSET_VALUE
+        @ca_cert_store = UNSET_VALUE
+        @ca_cert_file = UNSET_VALUE
       end
 
       def finalize!
@@ -49,6 +56,8 @@ module VagrantPlugins
         @disk_size = nil if @disk_size == UNSET_VALUE
 
         @ca_no_verify = false if @ca_no_verify == UNSET_VALUE
+        @ca_cert_store = nil if @ca_cert_store == UNSET_VALUE
+        @ca_cert_file = nil if @ca_cert_file == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog