vagrant-ovirt4 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06efacb9cd5bc8d26e60779d35eb749df58e67c7
-  data.tar.gz: f4af437a4d0a5271517ab889a2778a8ef48bce23
+  metadata.gz: a27827fdc957c72739e7370205f87421bdc11bb2
+  data.tar.gz: 696f0b8fa78127ca5ff3822b3f5ed1308118c9d8
 SHA512:
-  metadata.gz: 450e1eaca5c4508127c18951ffe237b52991f4a0b3b85e833294d95ae4c04b3452b616442a13cf9008f1e35ffd0bcfff4f70faa100250e04043883b638fcb8cd
-  data.tar.gz: 99aff87c777092ca05e9fd4d5dbd31a4b0529dcf833214294c879b467c915c139767b5a2a517c63c1b0754fc046c562ef24d84f7bcc80e18e05256ef2e6f0dd2
+  metadata.gz: cec6cf0493c478586ae46a5d4206908763e5ad1689b511afce420216f25e5eaf712f2d94b471bd7bdc5c35806f77da6a296fe4ae4ea9ac71675bd99241c07bb4
+  data.tar.gz: 7a03e6879022c4f263c46e42ae2accc102726830d7b5349159e7f30d32ada547c03188ea06757c347efac169cd144f7242f7aabb0b6d66a177fc7a32f416ac86

data/.gitignore

@@ -5,3 +5,5 @@
 .vagrant
 /.idea
 *.gem
+/manifests
+hiera.yaml

data/Gemfile

@@ -1,9 +1,7 @@
-source 'https://rubygems.org'
-
-gemspec
+source 'http://rubygems.org'
 
 group :development do
-  #gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
   gem 'pry'
   gem 'byebug'
   gem 'pry-byebug'
@@ -16,5 +14,5 @@ group :testing do
 end
 
 group :plugins do
-  #gem 'vagrant-ovirt4', :path => '.'
+  gem 'vagrant-ovirt4', :path => '.'
 end

data/Gemfile.lock

@@ -1,17 +1,81 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: b223380c86680a0a22caa7c288055411faa4a072
+  specs:
+    vagrant (1.9.2.dev)
+      childprocess (~> 0.5.0)
+      erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
+      i18n (>= 0.6.0, <= 0.8.0)
+      listen (~> 3.1.5)
+      log4r (~> 1.1.9, < 1.1.11)
+      net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
+      net-ssh (~> 3.0.1)
+      nokogiri (= 1.6.7.1)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 3.0)
+      ruby_dep (<= 1.3.1)
+      wdm (~> 0.1.0)
+      winrm (~> 2.1)
+      winrm-elevated (~> 1.1)
+      winrm-fs (~> 1.0)
+
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.0.2)
+    vagrant-ovirt4 (1.1.0)
+      filesize (~> 0)
       ovirt-engine-sdk (~> 4.0, >= 4.0.6)
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
+    builder (3.2.3)
     byebug (9.0.6)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
     diff-lcs (1.3)
+    domain_name (0.5.20161129)
+      unf (>= 0.0.5, < 1.0.0)
+    erubis (2.7.0)
+    ffi (1.9.17)
+    filesize (0.1.1)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashicorp-checkpoint (0.1.4)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (0.8.0)
     json (2.0.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    little-plugger (1.1.4)
+    log4r (1.1.10)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.0.0)
+    multi_json (1.12.1)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.0.2)
+    netrc (0.11.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    nori (2.6.0)
     ovirt-engine-sdk (4.1.2)
       json
     pry (0.10.4)
@@ -22,6 +86,15 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     rake (0.9.6)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.4)
+      ffi (>= 0.5.0)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -38,7 +111,31 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby_dep (1.3.1)
+    rubyntlm (0.6.1)
+    rubyzip (1.2.1)
     slop (3.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    wdm (0.1.1)
+    winrm (2.1.2)
+      builder (>= 2.1.2)
+      erubis (~> 2.7)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.0.1)
+      erubis (~> 2.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 2.0)
 
 PLATFORMS
   ruby
@@ -50,6 +147,7 @@ DEPENDENCIES
   rake
   rspec
   rspec-its
+  vagrant!
   vagrant-ovirt4!
 
 BUNDLED WITH

data/README.md

@@ -60,8 +60,9 @@ Vagrant.configure("2") do |config|
   config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
 
   config.vm.network :private_network,
-    :ip => '192.168.56.100', :nictype => 'virtio', :netmask => '255.255.255.0', #normal network configuration
-    :ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125' # oVirt specific information, overwrites previous on oVirt provider
+    :ovirt__network_name => 'ovirtmgmt' #DHCP
+    # Static configuration
+    #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local'
 
   config.vm.provider :ovirt4 do |ovirt|
     ovirt.url = 'https://server/ovirt-engine/api'
@@ -72,8 +73,8 @@ Vagrant.configure("2") do |config|
     ovirt.cluster = 'Default'
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
-    ovirt.memory_size = 512 #MB
-    ovirt.memory_guaranteed = 256 #MB
+    ovirt.memory_size = '1 GiB' #see https://github.com/dominikh/filesize for usage
+    ovirt.memory_guaranteed = '256 MB' #see https://github.com/dominikh/filesize for usage
     ovirt.cpu_cores = 2
     ovirt.cpu_sockets = 2
     ovirt.cpu_threads = 2
@@ -107,17 +108,17 @@ end
   1. `insecure` => Allow connecting to SSL sites without certificates. Optional. Bool. Default is `false`
   1. `debug` => Turn on additional log statements. Optional. Bool. Default is `false`.
   1. `datacenter` => The name of the ovirt datacenter to create within. Required. String. No Default value.
-    a. Note: (TODO) [Unknown usage](https://github.com/myoung34/vagrant-ovirt4/issues/26)
   1. `template` => The name of the template to use for creation. Required. String. No Default value.
   1. `cluster` => The name of the ovirt cluster to create within. Required. String. No Default value.
   1. `console` => The type of remote viewing protocol to use. Required. String. No Default value.
-    a. Note: (TODO) Enforce this to be Spice, VNC, and RDP
   1. `memory_size` => The physical size of the memory for the VM (in MB). Defaults to `256`
   1. `memory_guaranteed` => The guaranteed size of the memory for the VM (in MB). Note: cannot be larger than `memory_size`. Defaults to `memory_size`
   1. `cpu_cores` => The number of CPU cores. Defaults to `1`
   1. `cpu_sockets` => The number of CPU cores. Defaults to `1`
   1. `cpu_threads` => The number of CPU threads. Defaults to `1`
   1. `cloud_init` => The cloud-init data to pass. Must be properly formatted as yaml. [Docs here](http://cloudinit.readthedocs.io/en/latest/topics/examples.html)
+  1. `affinity` =>  The affinity to use. [See this for possible uses](http://www.rubydoc.info/gems/ovirt-engine-sdk/OvirtSDK4/VmAffinity). Optional. Invalid will cause a `RuntimeError`
+  1. `placement_host` => The host to start the VM on. Optional.
 
 
 ## Contributing
@@ -127,7 +128,3 @@ end
 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
-
-## Contributing Notes
-
-1. You must comment out `gemspec` in the [Gemfile](Gemfile), uncomment `vagrant` and `plugins/vagrant-ovirt4` in order for `bundle install` to work and use live code. Not sure why. Too lazy to figure it out.

data/lib/vagrant-ovirt4/action/create_network_interfaces.rb

@@ -16,35 +16,57 @@ module VagrantPlugins
 
         def call(env)
 
-          iface = "nic1"
           iface_options = nil
+          config = env[:machine].provider_config
           env[:machine].config.vm.networks.each do |config|
             type, options = config
-            # We support private and public networks only. They mean both the
-            # same right now.
+            # We support private networks only. They mean both the same right now.
             next unless [:private_network].include? type
 
             iface_options = scoped_hash_override(options, :ovirt)
           end
 
-          profiles_service = env[:connection].system_service.vnic_profiles_service
-          network_profile_id = profiles_service.list.map { |p| p.id if p.name == iface_options[:network_name] }.first
-          raise Errors::NoNetworkError, :network_name => iface_options[:network_name] if network_profile_id.nil?
-
-          @logger.info("Creating network interface #{iface}")
           begin
             nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
-            nics_service.add(
-              OvirtSDK4::Nic.new(
-                name: iface,
-                vnic_profile: {
-                  id: network_profile_id
-                }
+            if iface_options.nil?
+              # throw an error if they didn't provide any sort of information on interfaces _and_ the VM has none
+              raise Errors::NoNetworkError if nics_service.list.count == 0
+            else
+              # provided a network block of some sort. Search oVirt for the corresponding network_profile_ids
+              @logger.info("Finding network #{iface_options[:network_name]} for given cluster #{config.cluster}")
+              clusters_service = env[:connection].system_service.clusters_service
+              cluster = clusters_service.list(search: "name=#{config.cluster}").first
+              profiles_service = env[:connection].system_service.vnic_profiles_service
+              network_profile_ids = profiles_service.list.map do |profile|
+                if env[:connection].follow_link(profile.network).data_center.id == cluster.data_center.id and
+                     profile.name == iface_options[:network_name]
+                  profile.id
+                end
+              end
+              network_profile_id = network_profile_ids.compact.first
+              # error if they provided a 'network name' but it could not be located in the previous search
+              raise Errors::NetworkNotFoundError, :network_name => iface_options[:network_name] if network_profile_id.nil? and !iface_options[:network_name].nil?
+
+              # quick and dirty way to look for a 'nic#' that is not already attached to the machine
+              iface = (("nic1".."nic8").flat_map { |x| x } - env[:vms_service].vm_service(env[:machine].id).nics_service.list.map(&:name)).first rescue "vagrant_nic1"
+              @logger.info("Creating network interface #{iface}")
+              nics_service.add(
+                OvirtSDK4::Nic.new(
+                  name: iface,
+                  vnic_profile: {
+                    id: network_profile_id
+                  }
+                )
               )
-            )
+            end
           rescue => e
-            raise Errors::AddInterfaceError,
-              :error_message => e.message
+            if config.debug
+              raise e
+            else
+              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+              raise Errors::AddInterfaceError,
+                :error_message => fault_message
+            end
           end
 
           # Continue the middleware chain.

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

@@ -20,16 +20,15 @@ module VagrantPlugins
           hostname = 'vagrant' if hostname.nil?
 
           # Output the settings we're going to use to the user
-          memory_size = config.memory_size*1024*1024
-          memory_guaranteed = config.memory_guaranteed*1024*1024
           env[:ui].info(I18n.t("vagrant_ovirt4.creating_vm"))
           env[:ui].info(" -- Name:          #{hostname}")
           env[:ui].info(" -- Cluster:       #{config.cluster}")
           env[:ui].info(" -- Template:      #{config.template}")
           env[:ui].info(" -- Console Type:  #{config.console}")
           env[:ui].info(" -- Memory:        ")
-          env[:ui].info(" ---- Memory:      #{config.memory_size}")
-          env[:ui].info(" ---- Guaranteed:  #{config.memory_guaranteed}")
+          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
+          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MB').to_i} MB")
+          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MB').to_i} MB")
           env[:ui].info(" -- Cpu:           ")
           env[:ui].info(" ---- Cores:       #{config.cpu_cores}")
           env[:ui].info(" ---- Sockets:     #{config.cpu_sockets}")
@@ -47,11 +46,12 @@ module VagrantPlugins
                   :threads => config.cpu_threads,
                 },
               },
-              :memory   => memory_size,
-              :memory_policy => {
-                :ballooning => true,
-                :guaranteed => memory_guaranteed,
-              },
+              :memory_policy => OvirtSDK4::MemoryPolicy.new(
+                ballooning: true,
+                guaranteed: config.memory_guaranteed,
+                max: config.memory_maximum,
+              ),
+              :memory   => config.memory_size,
               :cluster  => {
                 :name => config.cluster,
               },
@@ -66,9 +66,13 @@ module VagrantPlugins
           begin
             server = env[:vms_service].add(attr) 
           rescue OvirtSDK4::Error => e
-            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
-            raise Errors::CreateVMError,
-              :error_message => fault_message
+            if config.debug
+              raise e
+            else
+              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+              raise Errors::CreateVMError,
+                :error_message => fault_message
+            end
           end
 
           # Immediately save the ID since it is created at this point.

data/lib/vagrant-ovirt4/action/start_vm.rb

@@ -15,6 +15,8 @@ module VagrantPlugins
         end
 
         def call(env)
+          config = env[:machine].provider_config
+
           env[:ui].info(I18n.t("vagrant_ovirt4.starting_vm"))
 
           machine = env[:vms_service].vm_service(env[:machine].id)
@@ -35,37 +37,63 @@ module VagrantPlugins
           hostname = 'vagrant' if hostname.nil?
 
           nic_configuration = nil
-          if iface_options[:ip] then
-            nic_configuration = {
-              name: 'eth0',
-              on_boot: true,
-              boot_protocol: OvirtSDK4::BootProtocol::STATIC,
-              ip: {
-                version: OvirtSDK4::IpVersion::V4,
-                address: iface_options[:ip],
-                gateway: iface_options[:gateway],
+          unless iface_options.nil?
+            if iface_options[:ip] then
+              nic_configuration = {
+                name: 'eth0',
+                on_boot: true,
+                boot_protocol: OvirtSDK4::BootProtocol::STATIC,
+                ip: {
+                  version: OvirtSDK4::IpVersion::V4,
+                  address: iface_options[:ip],
+                  gateway: iface_options[:gateway],
+                  netmask: iface_options[:netmask],
+                }
               }
-            }
-          else
-            nic_configuration = {
-              name: 'eth0',
-              on_boot: true,
-              boot_protocol: OvirtSDK4::BootProtocol::DYNAMIC,
-            }
-          end
+            else
+              nic_configuration = {
+                name: 'eth0',
+                on_boot: true,
+                boot_protocol: OvirtSDK4::BootProtocol::DHCP,
+              }
+            end
 
-          vm_configuration = {
-            initialization: {
+            initialization = {
               host_name: hostname,
               nic_configurations: [nic_configuration],
-              custom_script: env[:machine].provider_config.cloud_init,
+              custom_script: config.cloud_init,
             }
+
+            initialization[:dns_servers] = iface_options[:dns_servers] unless iface_options[:dns_servers].nil?
+            initialization[:dns_search] = iface_options[:dns_search] unless iface_options[:dns_search].nil?
+          end
+
+          vm_configuration = {
+            initialization: initialization,
+            placement_policy: {},
           }
-          
-          machine.start(
-            use_cloud_init: true,
-            vm: vm_configuration
-          )
+
+          vm_configuration[:placement_policy][:hosts] = [{ :name => config.placement_host }] unless config.placement_host.nil?
+          vm_configuration[:placement_policy][:affinity] = config.affinity unless config.affinity.nil?
+
+          vm_configuration.delete(:placement_policy) if vm_configuration[:placement_policy].empty?
+          vm_configuration.delete(:nic_configurations) if vm_configuration[:nic_configurations].nil? or vm_configuration[:nic_configurations].empty?
+
+          begin
+            machine.start(
+              use_cloud_init: true,
+              vm: vm_configuration
+            )
+          rescue OvirtSDK4::Error => e
+            if config.debug
+              raise e
+            else
+              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+              raise Errors::StartVMError,
+                :error_message => fault_message
+            end
+
+          end
 
           @app.call(env)
         end

data/lib/vagrant-ovirt4/config.rb

@@ -1,4 +1,6 @@
 require 'vagrant'
+require 'filesize'
+require 'ovirtsdk4'
 
 module VagrantPlugins
   module OVirtProvider
@@ -14,10 +16,13 @@ module VagrantPlugins
       attr_accessor :cpu_threads
       attr_accessor :template
       attr_accessor :memory_size
+      attr_accessor :memory_maximum
       attr_accessor :memory_guaranteed
       attr_accessor :cluster
       attr_accessor :console
       attr_accessor :cloud_init
+      attr_accessor :affinity
+      attr_accessor :placement_host
 
       def initialize
         @url               = UNSET_VALUE
@@ -30,10 +35,13 @@ module VagrantPlugins
         @cpu_threads       = UNSET_VALUE
         @template          = UNSET_VALUE
         @memory_size       = UNSET_VALUE
+        @memory_maximum    = UNSET_VALUE
         @memory_guaranteed = UNSET_VALUE
         @cluster           = UNSET_VALUE
         @console           = UNSET_VALUE
         @cloud_init        = UNSET_VALUE
+        @affinity          = UNSET_VALUE
+        @placement_host    = UNSET_VALUE
 
       end
 
@@ -48,11 +56,25 @@ module VagrantPlugins
         @cpu_threads = 1 if @cpu_threads == UNSET_VALUE
         @cluster = nil if @cluster == UNSET_VALUE
         @console = nil if @console == UNSET_VALUE
-        @memory_size = 256 if @memory_size == UNSET_VALUE
+        @memory_size = '256 MB' if @memory_size == UNSET_VALUE
+        @memory_maximum = @memory_size if @memory_maximum == UNSET_VALUE
         @memory_guaranteed = @memory_size if @memory_guaranteed == UNSET_VALUE
         @template = nil if @template == UNSET_VALUE
         @cloud_init = nil if @cloud_init == UNSET_VALUE
+        @affinity = nil if @affinity == UNSET_VALUE
+        @placement_host = nil if @placement_host == UNSET_VALUE
 
+        unless affinity.nil?
+          raise "Invalid affinity. Must be one of #{OvirtSDK4::VmAffinity.constants.map { |s| "'#{s.downcase}'" }.join(' ')}" unless OvirtSDK4::VmAffinity.constants.include? affinity.upcase.to_sym
+        end
+
+        begin
+          @memory_size = Filesize.from(@memory_size).to_f('B').to_i
+          @memory_maximum = Filesize.from(@memory_maximum).to_f('B').to_i
+          @memory_guaranteed = Filesize.from(@memory_guaranteed).to_f('B').to_i
+        rescue ArgumentError 
+          raise "Not able to parse either `memory_size` or `memory_guaranteed`. Please verify and check again."
+        end
       end
 
     end

data/lib/vagrant-ovirt4/errors.rb

@@ -31,6 +31,10 @@ module VagrantPlugins
         error_key(:no_network_error)
       end
 
+      class NetworkNotFoundError < VagrantOVirtError
+        error_key(:network_not_found_error)
+      end
+
       class NoIPError < VagrantOVirtError
         error_key(:no_ip_error)
       end

data/lib/vagrant-ovirt4/version.rb

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

data/locales/en.yml

@@ -61,6 +61,8 @@ en:
       start_vm_error: |-
         Unable to start VM: %{error_message}
       no_network_error: |-
+        No network provided and none were imported from the template. There would be no way to communicate with this machine.
+      network_not_found_error: |-
         No network %{network_name} found.
       wait_for_ready_vm_timeout: |-
         Timeout occurred while waiting for VM to become ready to start

data/spec/vagrant-ovirt4/config_spec.rb

@@ -39,14 +39,17 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("cluster")           { should be_nil }
     its("console")           { should be_nil }
     its("template")          { should be_nil }
-    its("memory_size")       { should == 256 }
-    its("memory_guaranteed") { should == 256 }
+    its("memory_size")       { should == 256000000 }
+    its("memory_maximum")    { should == 256000000 }
+    its("memory_guaranteed") { should == 256000000 }
     its("cloud_init")        { should be_nil }
+    its("affinity")          { should be_nil }
+    its("placement_host")    { should be_nil }
 
   end
 
   describe "overriding defaults" do
-    [:url, :username, :password, :insecure, :debug, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :memory_size, :memory_guaranteed, :cloud_init].each do |attribute|
+    [:url, :username, :password, :insecure, :debug, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :cloud_init, :placement_host].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -56,4 +59,46 @@ describe VagrantPlugins::OVirtProvider::Config do
     end
   end
 
+  describe "overriding memory defaults" do
+    [:memory_size, :memory_maximum, :memory_guaranteed].each do |attribute|
+
+      it "should not default #{attribute} if overridden" do
+        instance.send("#{attribute}=".to_sym, "512 MB")
+        instance.finalize!
+        instance.send(attribute).should == 512000000
+      end
+
+      it "should convert the value" do
+        instance.send("#{attribute}=".to_sym, "1 GB")
+        instance.finalize!
+        instance.send(attribute).should == 1000000000
+      end
+
+    end
+  end
+
+  describe "overriding affinity defaults" do
+    [:affinity].each do |attribute|
+
+      context 'valid value' do
+        it "should not default #{attribute} if overridden" do
+          instance.send("#{attribute}=".to_sym, "pinned")
+          instance.finalize!
+          instance.send(attribute).should == "pinned"
+        end
+      end
+
+      context 'invalid value' do
+        it "should error" do
+          expect {
+            instance.send("#{attribute}=".to_sym, "foo")
+            instance.finalize!
+          }.to raise_error(RuntimeError)
+
+        end
+
+      end
+
+    end
+  end
 end

data/tools/prepare_redhat_for_box.sh

@@ -42,7 +42,6 @@ fi
 if [[ $ATOMIC != "true" ]]; then
   yum install -y epel-release
   yum install -y ovirt-guest-agent-common
-  for i in cloud-init ovirt-guest-agent; do chkconfig $i on; done
   if [[ $RHEL_MAJOR_VERSION -eq 5 ]]; then
     yum install -y \
       http://ftp.astral.ro/mirrors/fedora/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm \
@@ -59,12 +58,18 @@ if [[ $ATOMIC != "true" ]]; then
     echo "Is this a valid major release?"
     exit 1
   fi
+else
+  ostree remote add --set=gpg-verify=false centos-atomic-continuous https://ci.centos.org/artifacts/sig-atomic/rdgo/centos-continuous/ostree/repo/
+  rpm-ostree rebase centos-atomic-continuous:centos-atomic-host/${RHEL_MAJOR_VERSION}/x86_64/devel/alpha
+  rpm-ostree pkg-add epel-release
+  rpm-ostree install ovirt-guest-agent-common
+  systemctl reboot
 fi
 
 # Install some required software.
 if [[ $ATOMIC != "true" ]]; then
   yum -y install openssh-server openssh-clients sudo curl \
-  ruby ruby-devel make gcc rubygems rsync puppet ovirt-guest-agent cloud-init \
+  ruby ruby-devel make gcc rubygems rsync puppet ovirt-guest-agent ovirt-guest-agent-common cloud-init \
   iptables-services net-tools
 fi
 
@@ -98,7 +103,9 @@ chown -R vagrant:vagrant $vagrant_home/.ssh
 
 # Disable firewall and switch SELinux to permissive mode.
 chkconfig iptables off
+chkconfig firewalld off
 chkconfig ip6tables off
+for i in cloud-init ovirt-guest-agent; do chkconfig $i on; done
 sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/sysconfig/selinux
 [ -f /etc/selinux/config ] && sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
 
@@ -111,7 +118,11 @@ rm -fr /var/lib/dhclient/*
 # Interface eth0 should always get IP address via dhcp.
 echo $'' > /etc/sysconfig/network-scripts/ifcfg-eth0
 
+CLOUD_CONFIG=/etc/cloud/cloud.cfg
+grep  -q ' - resolv-conf' $CLOUD_CONFIG || sed -i -e 's/ - timezone/&\n - resolv-conf/' $CLOUD_CONFIG
+
 # Do some cleanup..
 rm -f /root/.bash_history
 rm -f /root/authorized_keys
 [[ $ATOMIC != "true" ]] && yum clean all
+

data/vagrant-ovirt4.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |gem|
   gem.version       = VagrantPlugins::OVirtProvider::VERSION
 
   gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0', '>= 4.0.6'
+  gem.add_runtime_dependency 'filesize', '~> 0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -44,7 +58,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- docker-compose.yml
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box
@@ -125,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy

data/docker-compose.yml

@@ -1,9 +0,0 @@
-version: '2'
-
-services:
-    ruby:
-        image: ruby-2.2.0
-        container_name: ruby
-        build: .
-        volumes:
-          - .:/srv