vagrant-ovirt3 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e8eb7e6409de51e9157e77ace9f3b4dd2005cf
-  data.tar.gz: f3868ef9c66fc67d10a8f3386bf2d5551ef03e6e
+  metadata.gz: 666e8643bf765fcc152b93eeeb015051baa4ee61
+  data.tar.gz: 9d011d9260303de3cd9830234f0725a43aeabbd4
 SHA512:
-  metadata.gz: 1a3856cd0d6a6fc709f1ab3dedd0b3584b1c7bd9482fa798422925d270c4326b3fe67cff0da01cf56b44212ddb6c36772b84a64162533a5f6b355fbb66d3a505
-  data.tar.gz: 78ddf2cd982cbda1da9cf3ce173ffb9e32437e6ec076b459aea0afee2187287406af8401dd0bcd1dddef05875013d406e966ab991b0890a1f59cf7c8aa07eb47
+  metadata.gz: 51548dd0f3632d86c1e5eff7a7867edda8d4a725c6d99ef9d18ea37bfeee1d1388b97c08a7b308910572bcde809307a4059af5196aeb027a428b64b7136291b2
+  data.tar.gz: dfcbdac34197c3ed681a6a217e25b680e61a49151ab6136a0c88db0ee2b2a2a769b5bb99fbbac516fd937d671226331600a25e6c8cd7bb2aa5ba4c732f5711ec

data/README.md

@@ -44,6 +44,7 @@ Vagrant.configure('2') do |config|
     ovirt.quota = "e92124b9-22f4-4cef-bcd6-b9ae22155dcd"
     ovirt.ca_no_verify = true
     ovirt.memory_guaranteed = 2048 # Supported by oVirt 3.6 and above only
+    ovirt.connect_timeout = 30
   end
 end
 ```
@@ -65,6 +66,7 @@ This provider exposes quite a few provider-specific configuration options:
   certificate.
 * `quota` - The ID of the quota to use. This can be retrieved via the REST API
 * `memory_guaranteed` - The amount of memory guaranteed to the VM. *Supported by oVirt 3.6 and above only*
+* `connect_timeout` - The amount of time to wait until the VM changes state
 
 ### Domain Specific Options
 

data/example_box/Vagrantfile

@@ -14,12 +14,6 @@ Vagrant.configure("2") do |config|
     ovirt.template = "vagrant-centos65"
     ovirt.cpus = 1
     ovirt.memory = 512
-    ovirt.memory_guaranteed = 1024
     ovirt.ca_no_verify = true
   end
-  config.vm.provision 'shell' do |shell|
-    shell.inline =
-      'sudo yum install -y https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm >/dev/null 2>&1;' +
-      'sudo yum install -y hiera-1.3.2 puppet-3.5.1;' 
-  end
 end

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

@@ -23,6 +23,7 @@ module VagrantPlugins
           memory_guaranteed_size = config.memory_guaranteed ? config.memory_guaranteed*1024 : nil
           quota = config.quota
           memory_size = config.memory*1024
+          connect_timeout = config.connect_timeout
           user_data = config.user_data ?
             Base64::encode64(config.user_data) :
             nil
@@ -107,7 +108,7 @@ module VagrantPlugins
 
           # Wait till all volumes are ready.
           env[:ui].info(I18n.t("vagrant_ovirt3.wait_for_ready_vm"))
-          for i in 0..10
+          for i in 0..connect_timeout
             ready = true
             server = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
             server.volumes.each do |volume|

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

@@ -16,6 +16,7 @@ module VagrantPlugins
         def call(env)
           # Is it necessary to resize the disk?
           config = env[:machine].provider_config
+          connect_timeout = config.connect_timeout
           if config.disk_size.nil?
             # Nothing to do
             @app.call(env)
@@ -44,7 +45,7 @@ module VagrantPlugins
 
           # Wait till all volumes are ready.
           env[:ui].info(I18n.t("vagrant_ovirt3.wait_for_ready_volume"))
-          for i in 0..10
+          for i in 0..connect_timeout
             ready = true
             machine = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
             machine.volumes.each do |volume|

data/lib/vagrant-ovirt3/action.rb

@@ -147,7 +147,8 @@ module VagrantPlugins
       def self.action_ssh_run
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
+          b.use ConnectOVirt
+          b.use Call, ReadState do |env, b2|
             if env[:machine_state_id] == :not_created
               b2.use MessageNotCreated
               next

data/lib/vagrant-ovirt3/config.rb

@@ -11,6 +11,8 @@ module VagrantPlugins
       attr_accessor :cluster
       attr_accessor :filtered_api
 
+      attr_accessor :connect_timeout
+
       # Domain specific settings used while creating new machine.
       attr_accessor :memory
       attr_accessor :memory_guaranteed
@@ -29,12 +31,14 @@ module VagrantPlugins
       attr_accessor :ca_cert_file
 
       def initialize
-        @url            = UNSET_VALUE
-        @username       = UNSET_VALUE
-        @password       = UNSET_VALUE
-        @datacenter     = UNSET_VALUE
-        @cluster        = UNSET_VALUE
-        @filtered_api   = UNSET_VALUE
+        @url             = UNSET_VALUE
+        @username        = UNSET_VALUE
+        @password        = UNSET_VALUE
+        @datacenter      = UNSET_VALUE
+        @cluster         = UNSET_VALUE
+        @filtered_api    = UNSET_VALUE
+
+        @connect_timeout = UNSET_VALUE
 
         # Domain specific settings.
         @memory            = UNSET_VALUE
@@ -60,6 +64,7 @@ module VagrantPlugins
         @datacenter = nil if @datacenter == UNSET_VALUE
         @cluster = nil if @cluster == UNSET_VALUE
         @filtered_api = false if @filtered_api == UNSET_VALUE
+        @connect_timeout = 10 if @connect_timeout == UNSET_VALUE
 
         # Domain specific settings.
         @memory = 512 if @memory == UNSET_VALUE

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.8.2'
+    VERSION = '1.9.0'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Marcus Young