vagrant-ovirt3 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f29af2b1bcf8422c9c8d8d4e1ad8eba80ec2520
-  data.tar.gz: 194dd0976a52eda99b590e6315d98ff71c04d95a
+  metadata.gz: 2f4381759317a8261e528eac75a53692f96db524
+  data.tar.gz: 0520499d7cb7c254ae47f0e25da3b8340fb2f5d7
 SHA512:
-  metadata.gz: 96183c618d0c9d7ed45c978c765472e2675dd8a7c15754a027100f5896583507b2883e73f6d2377b5d269dfa8bf597b24c3846080bf4220c21b3edd4b2c175ec
-  data.tar.gz: b333a22068d753b8693d846fd82c2a16de88379052a0f9b55ca45014ac2ed6b11191b2c277db07ee0479d9840cc31d16ab70be80d64b3a127a28a02b56eb1471
+  metadata.gz: 3770ab823335d22323ca3963f3cbe51843386fad2040ab364231c6a88e1ee3735f5856c4535593697a647fb486bfabae48ce231ad2df73038e73dbf500119834
+  data.tar.gz: 659916d19908bab14d4becb247a79095c7cb44b9efe831ae3633de968cec46a98b8f5bc08d040876ec273d5519e88c61061d79cedadb67f161279672eea4f488

data/example_box/Vagrantfile

@@ -14,6 +14,10 @@ Vagrant.configure("2") do |config|
     ovirt.template = "vagrant-centos65"
     ovirt.cpus = 1
     ovirt.memory = 512
-    ovirt.ca_no_verify = true
+#    ovirt.ca_no_verify = true
+#    ovirt.user_data =<<EOF
+#runcmd:
+#  - yum install -y java-1.7.0-openjdk
+#EOF
   end
 end

data/lib/vagrant-ovirt3/action.rb

@@ -99,7 +99,9 @@ module VagrantPlugins
             end
 
             b2.use ConnectOVirt
-            b3.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
+            b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
+            b2.use HaltVM
+            b2.use WaitTillDown
             b2.use DestroyVM
           end
         end
@@ -213,6 +215,7 @@ module VagrantPlugins
       autoload :ReadState, action_root.join("read_state")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :WaitTillUp, action_root.join("wait_till_up")
+      autoload :WaitTillDown, action_root.join("wait_till_down")
       autoload :SyncFolders, action_root.join("sync_folders")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageAlreadyUp, action_root.join("message_already_up")

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

@@ -117,6 +117,9 @@ module VagrantPlugins
                 break
               end
             end
+            if env[:machine].state.id != :down
+              ready = false
+            end
             break if ready
             sleep 2
           end

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

@@ -0,0 +1,45 @@
+require 'log4r'
+require 'vagrant-ovirt3/util/timer'
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+
+      # Wait till VM is stopped
+      class WaitTillDown
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_ovirt3::action::wait_till_down")
+          @app = app
+        end
+
+        def call(env)
+          config = env[:machine].provider_config
+          connect_timeout = config.connect_timeout
+
+          env[:ui].info(I18n.t("vagrant_ovirt3.wait_till_down"))
+          for i in 0..connect_timeout
+            ready = true
+            server = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
+            if env[:machine].state.id != :down
+              ready = false
+            end
+            break if ready
+            sleep 2
+          end
+
+          if not ready
+            raise Errors::WaitForShutdownVmTimeout
+          end
+
+          
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/vagrant-ovirt3/errors.rb

@@ -63,6 +63,10 @@ module VagrantPlugins
         error_key(:wait_for_ready_vm_timeout)
       end
 
+      class WaitForShutdownVmTimeout < VagrantOVirtError
+        error_key(:wait_for_shutdown_vm_timeout)
+      end
+     
       class NoIpAddressError < VagrantOVirtError
         error_key(:no_ip_address_error)
       end

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.9.1'
+    VERSION = '1.9.2'
   end
 end
 

data/locales/en.yml

@@ -16,6 +16,8 @@ en:
       Halting VM...
     error_recovering: |-
       An error occured. Recovering..
+    wait_till_down: |-
+      Waiting for VM to shutdown...
     waiting_for_ip: |-
       Waiting for VM to get an IP address...
     waiting_for_ssh: |-
@@ -83,6 +85,8 @@ en:
         Error while updating volume. %{error_message}
       wait_for_ready_resized_volume_timeout: |-
         Timeout occurred while waiting for resized volume to become ready
+      wait_for_shutdown_vm_timeout: |-
+        Timeout occurred while waiting for VM to shutdown
 
     states:
       short_paused: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -96,6 +96,7 @@ files:
 - lib/vagrant-ovirt3/action/start_vm.rb
 - lib/vagrant-ovirt3/action/suspend_vm.rb
 - lib/vagrant-ovirt3/action/sync_folders.rb
+- lib/vagrant-ovirt3/action/wait_till_down.rb
 - lib/vagrant-ovirt3/action/wait_till_up.rb
 - lib/vagrant-ovirt3/cap/nic_mac_addresses.rb
 - lib/vagrant-ovirt3/config.rb