vagrant-ovirt3 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7169ec49f52e7643c9e559afd8d4780c60df54
-  data.tar.gz: efc888c31c0240929079252b617e63edbd0874d5
+  metadata.gz: fb418a1dcb47db6316ed502682775154fa41a468
+  data.tar.gz: 0daaf7c450f4aa512caaca2375058b7120a122bf
 SHA512:
-  metadata.gz: d854df91f685af9e3279977757ff529a722a5a8cbb37be9435b98158e424a0e1085281a97ba84bf18233865449438722564253a518902df5fbd23a2f6989569b
-  data.tar.gz: a80393f2798818b005bed078d3c2a2b1c1e4be5fb9dab94782e3f246aa1928d68c323df7720bffd866a08d8c10ee0dfca2d1e09eaf3d2e07cbf3b9851cf7b05b
+  metadata.gz: e338380c448b4fc231fca4c5580978657f9c14e8b0aa53707951858402526f3f41802f32698ec6fab7ba4b5bfffbd7053d193e7ca92aca79f0d7d028c7308f0c
+  data.tar.gz: c63e3b5c922a6f6c49d97a8ba5ad1ac8fa666db4ea2565bf51e5a1e9146f3140c2797c6d642245606818b201511d85182f82682e8c4af5d6c57c2a34b6b6c6b2

data/README.md

@@ -1,4 +1,6 @@
 # Vagrant oVirt/RHEV v3 Provider
+[![Gem Version](https://badge.fury.io/rb/vagrant-ovirt3.svg)](http://badge.fury.io/rb/vagrant-ovirt3)
+[![vagrant-ovirt3 API Documentation](https://www.omniref.com/ruby/gems/vagrant-ovirt3.png)](https://www.omniref.com/ruby/gems/vagrant-ovirt3)
 
 This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
 [oVirt v3](http://ovirt.org) and
@@ -26,10 +28,10 @@ Vagrant.configure('2') do |config|
   config.vm.box = 'ovirt'
   config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt3/blob/master/example_box/dummy.box?raw=true'
 
-  config.vm.network :private_network, 
+  config.vm.network :private_network,
     :ip => '192.168.56.100', :nictype => 'virtio', :netmask => '255.255.255.0', #normal network configuration
     :ovirt__ip => '10.101.55.72', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '10.101.55.1' # oVirt specific information, overwrites previous on oVirt provider
-    
+
   config.vm.provider :ovirt3 do |ovirt|
     ovirt.template = 'template'
     ovirt.cpus = 1
@@ -64,9 +66,16 @@ This provider exposes quite a few provider-specific configuration options:
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
 * `template` - Name of template from which new VM should be created.
+* `template_version` - If a template has sub-versions, specify a sub-version
+ number or name.
 * `console` - Console type to use. Can be 'vnc' or 'spice'. Default is 'spice'
 * `disk_size` - If set, the first volume of the VM will automatically be resized
  to the specified value. disk_size is in GB
+* `user_data` - If given, user data is made available to the VM via a virtual
+ floppy disk.  This data is used to configure VMs via cloud-init. The value for
+ `user_data` should generally be a string in [cloud-config format][].
+
+[cloud-config format]: https://cloudinit.readthedocs.org/en/latest/topics/examples.html
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -95,14 +104,14 @@ Note, the network information will differ between the two. Under virtualbox, it
 Vagrant.configure('2') do |config|
   config.vm.box = 'mybox'
 
-   config.vm.network :private_network, 
+   config.vm.network :private_network,
     :ip => '192.168.56.100', :nictype => 'virtio', :netmask => '255.255.255.0' #normal network configuration
     :ovirt__ip => '10.101.55.72', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '10.101.55.1', # oVirt specific information, overwrites previous on oVirt provider
-    
+
   config.vm.provider :virtualbox do |vb|
     vb.customize [
       # Key                Value
-      'modifyvm',          :id, 
+      'modifyvm',          :id,
       '--cpuexecutioncap', '90',
       '--memory',          '1376',
       '--nictype2',        'virtio',
@@ -127,14 +136,24 @@ Vagrant.configure('2') do |config|
 
   config.vm.provision :puppet do |puppet|
     puppet.options = [
-      "--environment development", 
-      '--hiera_config=/etc/puppet/hiera/hiera.yaml', 
+      "--environment development",
+      '--hiera_config=/etc/puppet/hiera/hiera.yaml',
     ]
     puppet.manifests_path = './manifests'
     puppet.manifest_file = 'default.pp'
   end
 ```
 
+### Parallel Support
+
+By default VMs will be created and provisioned in parallel.  If this causes
+resource issues or you want VMs to be created in series use --no-parallel
+
+```
+$ vagrant up 
+$ vagrant up --no-parallel
+```
+
 ### How Project Is Created
 
 Vagrant goes through steps below when creating new project:
@@ -188,4 +207,3 @@ The box is a tarball containing:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-

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

@@ -21,6 +21,9 @@ module VagrantPlugins
           console = config.console
           cpus = config.cpus
           memory_size = config.memory*1024
+          user_data = config.user_data ?
+            Base64::encode64(config.user_data) :
+            nil
 
           # Get cluster
           if config.cluster == nil
@@ -34,12 +37,25 @@ module VagrantPlugins
           env[:ovirt_cluster] = cluster
 
           # Get template
-          template = OVirtProvider::Util::Collection.find_matching(
-            env[:ovirt_compute].templates.all, config.template)
+          template = env[:ovirt_compute].templates.all.find_all { |t|
+            t.id == config.template or t.name == config.template
+          }
+          .sort_by { |t| t.raw.version.version_number.to_i }.reverse
+          .find { |t|
+            v = t.raw.version
+            cv = config.template_version
+            cv.nil? or (cv.to_i == v.version_number.to_i or cv == v.version_name)
+          }
           if template == nil
             raise Error::NoTemplateError,
               :template_name => config.template
           end
+          ver = template.raw.version
+          if !ver.version_name.nil? and !ver.version_name.empty?
+            version_string = "#{ver.version_name} (#{ver.version_number.to_i})"
+          else
+            version_string = "#{ver.version_number.to_i}"
+          end
 
           # Output the settings we're going to use to the user
           env[:ui].info(I18n.t("vagrant_ovirt3.creating_vm"))
@@ -47,12 +63,16 @@ module VagrantPlugins
           env[:ui].info(" -- Cpus:          #{cpus}")
           env[:ui].info(" -- Memory:        #{memory_size/1024}M")
           env[:ui].info(" -- Template:      #{template.name}")
+          env[:ui].info(" -- Version:       #{version_string}")
           env[:ui].info(" -- Datacenter:    #{config.datacenter}")
           env[:ui].info(" -- Cluster:       #{cluster.name}")
           env[:ui].info(" -- Console:       #{console}")
           if config.disk_size
             env[:ui].info(" -- Disk size:     #{config.disk_size}G")
           end
+          if config.user_data
+            env[:ui].info(" -- User data:\n#{config.user_data}")
+          end
 
           # Create oVirt VM.
           attr = {
@@ -62,6 +82,7 @@ module VagrantPlugins
               :cluster  => cluster.id,
               :template => template.id,
               :display  => {:type => console },
+              :user_data => user_data,
           }
 
           begin

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

@@ -0,0 +1,23 @@
+require 'log4r'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class HaltVM
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_ovirt3::action::halt_vm")
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.halt_vm"))
+
+          machine = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
+          machine.stop
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class MessageAlreadyUp
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.already_up"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class MessageNotSuspended
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.not_suspended"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class MessageNotUp
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.not_up"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class MessageSavingState
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.saving_state"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -16,20 +16,20 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        # Possible states include (but may not be limited to):
+        # :not_created, :up, :down, :saving_state, :suspended
         def read_state(ovirt, machine)
           return :not_created if machine.id.nil?
 
           # Find the machine
           server = ovirt.servers.get(machine.id)
-          if server.nil? || [:"shutting-down", :terminated].include?(server.status.to_sym)
-            # The machine can't be found
-            @logger.info("Machine not found or terminated, assuming it got destroyed.")
+          if server.nil?
             machine.id = nil
             return :not_created
           end
 
           # Return the state
-          return server.status
+          return server.status.to_sym
         end
       end
     end

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

@@ -11,7 +11,7 @@ module VagrantPlugins
         def call(env)
           env[:domain_name] = env[:root_path].basename.to_s.dup
           env[:domain_name].gsub!(/[^-a-z0-9_]/i, "")
-          env[:domain_name] << "_#{Time.now.to_i}"
+          env[:domain_name] << "_#{Time.now.to_f}"
 
           # Check if the domain name is not already taken
           domain = OVirtProvider::Util::Collection.find_matching(

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

@@ -0,0 +1,24 @@
+require 'log4r'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class SuspendVM
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_ovirt3::action::suspend_vm")
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_ovirt3.suspend_vm"))
+
+          machine = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
+          machine.suspend
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-ovirt3/action.rb

@@ -11,20 +11,29 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectOVirt
-          b.use Call, IsCreated do |env, b2|
-            if env[:result]
-              b2.use MessageAlreadyCreated
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :up
+              b2.use SyncFolders
+              b2.use MessageAlreadyUp
               next
             end
 
-            b2.use SetNameOfDomain
-            b2.use CreateVM
-            b2.use ResizeDisk
+            if env[:machine_state_id] == :saving_state
+              b2.use MessageSavingState
+              next
+            end
 
-            b2.use Provision
-            b2.use CreateNetworkInterfaces
+            if env[:machine_state_id] == :not_created
+              b2.use SetNameOfDomain
+              b2.use CreateVM
+              b2.use ResizeDisk
+
+              b2.use Provision
+              b2.use CreateNetworkInterfaces
+
+              b2.use SetHostname
+            end
 
-            b2.use SetHostname
             b2.use StartVM
             b2.use WaitTillUp
             b2.use SyncFolders
@@ -32,6 +41,42 @@ module VagrantPlugins
         end
       end
 
+      def self.action_halt
+        with_ovirt do |env, b|
+          if env[:machine_state_id] != :up
+            b.use MessageNotUp
+            next
+          end
+          b.use HaltVM
+        end
+      end
+
+      def self.action_suspend
+        with_ovirt do |env, b|
+          if env[:machine_state_id] != :up
+            b.use MessageNotUp
+            next
+          end
+          b.use SuspendVM
+        end
+      end
+
+      def self.action_resume
+        with_ovirt do |env, b|
+          if env[:machine_state_id] == :saving_state
+            b.use MessageSavingState
+            next
+          end
+          if env[:machine_state_id] != :suspended
+            b.use MessageNotSuspended
+            next
+          end
+          b.use StartVM
+          b.use WaitTillUp
+          b.use SyncFolders
+        end
+      end
+
       # This is the action that is primarily responsible for completely
       # freeing the resources of the underlying virtual machine.
       def self.action_destroy
@@ -73,11 +118,16 @@ module VagrantPlugins
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+          b.use ConnectOVirt
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
               b2.use MessageNotCreated
               next
             end
+            if env[:machine_state_id] != :up
+              b2.use MessageNotUp
+              next
+            end
             b2.use SSHExec
           end
         end
@@ -87,10 +137,14 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            if env[:machine_state_id] == :not_created
               b2.use MessageNotCreated
               next
             end
+            if env[:machine_state_id] != :up
+              b2.use MessageNotUp
+              next
+            end
             b2.use SSHRun
           end
         end
@@ -119,12 +173,33 @@ module VagrantPlugins
       autoload :ResizeDisk, action_root.join("resize_disk")
       autoload :StartVM, action_root.join("start_vm")
       autoload :MessageNotCreated, action_root.join("message_not_created")
+      autoload :HaltVM, action_root.join("halt_vm")
+      autoload :SuspendVM, action_root.join("suspend_vm")
       autoload :DestroyVM, action_root.join("destroy_vm")
       autoload :ReadState, action_root.join("read_state")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :WaitTillUp, action_root.join("wait_till_up")
       autoload :SyncFolders, action_root.join("sync_folders")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
+      autoload :MessageAlreadyUp, action_root.join("message_already_up")
+      autoload :MessageNotUp, action_root.join("message_not_up")
+      autoload :MessageSavingState, action_root.join("message_saving_state")
+      autoload :MessageNotSuspended, action_root.join("message_not_suspended")
+
+      private
+      def self.with_ovirt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOVirt
+          b.use Call, ReadState do |env, b2|
+            if !env[:machine_state_id] == :not_created
+              b2.use MessageNotCreated
+              next
+            end
+            yield env, b2
+          end
+        end
+      end
     end
   end
 end

data/lib/vagrant-ovirt3/config.rb

@@ -15,8 +15,10 @@ module VagrantPlugins
       attr_accessor :memory
       attr_accessor :cpus
       attr_accessor :template
+      attr_accessor :template_version
       attr_accessor :console
       attr_accessor :disk_size
+      attr_accessor :user_data
 
       # TODO: change 'ca_cert_store' to 'ca_cert' once rbovirt PR #55 merges.
       attr_accessor :ca_no_verify
@@ -35,8 +37,10 @@ module VagrantPlugins
         @memory     = UNSET_VALUE
         @cpus       = UNSET_VALUE
         @template   = UNSET_VALUE
+        @template_version = UNSET_VALUE
         @console    = UNSET_VALUE
         @disk_size  = UNSET_VALUE
+        @user_data  = UNSET_VALUE
 
         @ca_no_verify = UNSET_VALUE
         @ca_cert_store = UNSET_VALUE
@@ -55,8 +59,10 @@ module VagrantPlugins
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == 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
 
         @ca_no_verify = false if @ca_no_verify == UNSET_VALUE
         @ca_cert_store = nil if @ca_cert_store == UNSET_VALUE

data/lib/vagrant-ovirt3/plugin.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
         Config
       end
 
-      provider "ovirt3" do
+      provider("ovirt3", parallel: true) do
         # Setup logging and i18n
         setup_logging
         setup_i18n

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end
 

data/locales/en.yml

@@ -6,8 +6,14 @@ en:
       Removing VM...
     not_created: |-
       VM is not created. Please run `vagrant up` first.
+    not_up: |-
+      VM is not running. Please run `vagrant up` first.
     starting_vm: |-
       Starting VM.
+    suspend_vm: |-
+      Suspending VM...
+    halt_vm: |-
+      Halting VM...
     error_recovering: |-
       An error occured. Recovering..
     waiting_for_ip: |-
@@ -20,10 +26,16 @@ en:
       Waiting for VM to become "ready" to start...
     already_created: |-
       VM is already created.
+    already_up: |-
+      VM is already up.
     ready: |-
       Machine is booted and ready for use!
     wait_for_ready_volume: |-
       Waiting for VM volume to become "ready" to start...
+    saving_state: |-
+      VM is busy saving state. Please wait and try again.
+    not_suspended: |-
+      VM is not in a suspended state.
 
     errors:
       fog_ovirt_connection_error: |-

data/vagrant-ovirt3.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/vagrant-ovirt3/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Marcus Young"]
-  gem.email         = ["myoung34@my.apsu.edu"]
+  gem.email	        = ["myoung34@my.apsu.edu"]
   gem.description   = %q{Vagrant provider for oVirt and RHEV v3}
   gem.summary       = %q{This vagrant plugin provides the ability to create, control, and destroy virtual machines under oVirt/RHEV}
   gem.homepage      = "https://github.com/myoung34/vagrant-ovirt3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -80,14 +80,20 @@ files:
 - lib/vagrant-ovirt3/action/create_network_interfaces.rb
 - lib/vagrant-ovirt3/action/create_vm.rb
 - lib/vagrant-ovirt3/action/destroy_vm.rb
+- lib/vagrant-ovirt3/action/halt_vm.rb
 - lib/vagrant-ovirt3/action/is_created.rb
 - lib/vagrant-ovirt3/action/message_already_created.rb
+- lib/vagrant-ovirt3/action/message_already_up.rb
 - lib/vagrant-ovirt3/action/message_not_created.rb
+- lib/vagrant-ovirt3/action/message_not_suspended.rb
+- lib/vagrant-ovirt3/action/message_not_up.rb
+- lib/vagrant-ovirt3/action/message_saving_state.rb
 - lib/vagrant-ovirt3/action/read_ssh_info.rb
 - lib/vagrant-ovirt3/action/read_state.rb
 - lib/vagrant-ovirt3/action/resize_disk.rb
 - lib/vagrant-ovirt3/action/set_name_of_domain.rb
 - 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_up.rb
 - lib/vagrant-ovirt3/config.rb