vagrant-ovirt4 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2690fdfbe56701cfba099a852e6ebaecd585a6d
-  data.tar.gz: 5811a4800e3fe9a517d4693ca55b17c56217276c
+  metadata.gz: 06efacb9cd5bc8d26e60779d35eb749df58e67c7
+  data.tar.gz: f4af437a4d0a5271517ab889a2778a8ef48bce23
 SHA512:
-  metadata.gz: 4bc0df26055298745853783bf15382a6aec086b1dad1f6b141fd25b03ecb92fb7523606954a4b929894535c614bc356a483c34dca572a9006b521fa04334579c
-  data.tar.gz: 51cc4ad1c81e3110ede3d771ab6358b707e09d38767288270390876a212a5fc420631cf5b88f64c0d10eccf827b3c294e1e7cae80ffb327f9d1eecaf34b34d1c
+  metadata.gz: 450e1eaca5c4508127c18951ffe237b52991f4a0b3b85e833294d95ae4c04b3452b616442a13cf9008f1e35ffd0bcfff4f70faa100250e04043883b638fcb8cd
+  data.tar.gz: 99aff87c777092ca05e9fd4d5dbd31a4b0529dcf833214294c879b467c915c139767b5a2a517c63c1b0754fc046c562ef24d84f7bcc80e18e05256ef2e6f0dd2

data/Gemfile

@@ -11,9 +11,10 @@ end
 
 group :testing do
   gem 'rspec-its'
+  gem 'rspec'
   gem 'rake'
 end
 
 group :plugins do
-  gem 'vagrant-ovirt4', :path => '.'
+  #gem 'vagrant-ovirt4', :path => '.'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.0.0)
+    vagrant-ovirt4 (1.0.2)
       ovirt-engine-sdk (~> 4.0, >= 4.0.6)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     diff-lcs (1.3)
     json (2.0.3)
     method_source (0.8.2)
-    ovirt-engine-sdk (4.1.1)
+    ovirt-engine-sdk (4.1.2)
       json
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -22,6 +22,10 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     rake (0.9.6)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -30,6 +34,9 @@ GEM
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     slop (3.6.0)
 
@@ -41,8 +48,9 @@ DEPENDENCIES
   pry
   pry-byebug
   rake
+  rspec
   rspec-its
   vagrant-ovirt4!
 
 BUNDLED WITH
-   1.12.5
+   1.14.4

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Marcus Young
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -72,6 +72,19 @@ 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.cpu_cores = 2
+    ovirt.cpu_sockets = 2
+    ovirt.cpu_threads = 2
+    ovirt.cloud_init =<<EOF
+write_files:
+  - content: |
+      Hello, world!
+    path: /tmp/greeting.txt
+    permissions: '0644'
+EOF
+
   end
 end
 ```
@@ -93,16 +106,19 @@ end
   1. `password` => The password for the API. Required. String. No default value.
   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. `cpus` => Number of CPUs to use for the VM. Optional. Integer. Default is `1`. 
-    a. Note: (TODO) [Unknown usage](https://github.com/myoung34/vagrant-ovirt4/issues/26)
   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. `memory` => The amount of RAM to use. 
-    a. Note: (TODO) [Unknown usage/defaults](https://github.com/myoung34/vagrant-ovirt4/issues/26)
   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)
+
 
 ## Contributing
 
@@ -111,3 +127,7 @@ 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/docker-compose.yml

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

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

@@ -20,19 +20,42 @@ 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(" -- Cpu:           ")
+          env[:ui].info(" ---- Cores:       #{config.cpu_cores}")
+          env[:ui].info(" ---- Sockets:     #{config.cpu_sockets}")
+          env[:ui].info(" ---- Threads:     #{config.cpu_threads}")
+          env[:ui].info(" -- Cloud-Init:    #{!config.cloud_init.nil? }")
 
           # Create oVirt VM.
           attr = {
               :name     => hostname,
+              :cpu      => {
+                :architecture => 'x86_64',
+                :topology => {
+                  :cores   => config.cpu_cores,
+                  :sockets => config.cpu_sockets,
+                  :threads => config.cpu_threads,
+                },
+              },
+              :memory   => memory_size,
+              :memory_policy => {
+                :ballooning => true,
+                :guaranteed => memory_guaranteed,
+              },
               :cluster  => {
                 :name => config.cluster,
               },
-              :template  => {
+              :template => {
                 :name => config.template,
               },
               :display  => {
@@ -43,7 +66,7 @@ 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
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
             raise Errors::CreateVMError,
               :error_message => fault_message
           end

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

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

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

@@ -0,0 +1,71 @@
+require 'log4r'
+require 'vagrant/util/scoped_hash_override'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      # Resize the disk if necessary, before VM is running.
+      class ResizeDisk
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_ovirt::action::resize_disk")
+          @app = app
+        end
+
+        def call(env)
+          # Is it necessary to resize the disk?
+          config = env[:machine].provider_config
+          if config.disk_size.nil?
+            # Nothing to do
+            @app.call(env)
+            return
+          end
+
+          # Get machine first.
+          begin
+            machine = OVirtProvider::Util::Collection.find_matching(
+              env[:ovirt_compute].servers.all, env[:machine].id.to_s)
+          rescue => e
+            raise Errors::NoVMError,
+              :vm_name => env[:machine].id.to_s
+          end
+
+          # Extend disk size if necessary
+          begin
+            machine.update_volume(
+              :id      => machine.volumes.first.id,
+              :size    => config.disk_size*1024*1024*1024,
+            )
+          rescue => e
+            raise Errors::UpdateVolumeError,
+              :error_message => e.message
+          end
+
+          # Wait till all volumes are ready.
+          env[:ui].info(I18n.t("vagrant_ovirt4.wait_for_ready_volume"))
+          for i in 0..10
+            ready = true
+            machine = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
+            machine.volumes.each do |volume|
+              if volume.status != 'ok'
+                ready = false
+                break
+              end
+            end
+            break if ready
+            sleep 2
+          end
+
+          if not ready
+            raise Errors::WaitForReadyResizedVolumeTimeout
+          end
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -31,11 +31,6 @@ module VagrantPlugins
             iface_options = scoped_hash_override(options, :ovirt)
           end
 
-          my_script = ""
-          #runcmd:
-          # - [ service, network, restart]
-          #"
-
           hostname = env[:machine].config.vm.hostname
           hostname = 'vagrant' if hostname.nil?
 
@@ -63,7 +58,7 @@ module VagrantPlugins
             initialization: {
               host_name: hostname,
               nic_configurations: [nic_configuration],
-              custom_script: my_script,
+              custom_script: env[:machine].provider_config.cloud_init,
             }
           }
           

data/lib/vagrant-ovirt4/cap/nic_mac_addresses.rb

@@ -0,0 +1,15 @@
+# vim: ai ts=2 sts=2 et sw=2 ft=ruby
+module VagrantPlugins
+  module OVirtProvider
+    module Cap
+      module NicMacAddresses
+        def self.nic_mac_addresses(machine)
+          ovirt = OVirtProvider.ovirt_connection
+          interfaces = ovirt.list_vm_interfaces(machine.id.to_s)
+          Hash[interfaces.map{ |i| [i[:name], i[:mac]] }]
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-ovirt4/config.rb

@@ -9,23 +9,31 @@ module VagrantPlugins
       attr_accessor :password
       attr_accessor :insecure
       attr_accessor :debug
-      attr_accessor :cpus
+      attr_accessor :cpu_cores
+      attr_accessor :cpu_sockets
+      attr_accessor :cpu_threads
       attr_accessor :template
-      attr_accessor :memory
+      attr_accessor :memory_size
+      attr_accessor :memory_guaranteed
       attr_accessor :cluster
       attr_accessor :console
+      attr_accessor :cloud_init
 
       def initialize
-        @url            = UNSET_VALUE
-        @username       = UNSET_VALUE
-        @password       = UNSET_VALUE
-        @insecure       = UNSET_VALUE
-        @debug          = UNSET_VALUE
-        @cpus           = UNSET_VALUE
-        @template       = UNSET_VALUE
-        @memory         = UNSET_VALUE
-        @cluster        = UNSET_VALUE
-        @console        = UNSET_VALUE
+        @url               = UNSET_VALUE
+        @username          = UNSET_VALUE
+        @password          = UNSET_VALUE
+        @insecure          = UNSET_VALUE
+        @debug             = UNSET_VALUE
+        @cpu_cores         = UNSET_VALUE
+        @cpu_sockets       = UNSET_VALUE
+        @cpu_threads       = UNSET_VALUE
+        @template          = UNSET_VALUE
+        @memory_size       = UNSET_VALUE
+        @memory_guaranteed = UNSET_VALUE
+        @cluster           = UNSET_VALUE
+        @console           = UNSET_VALUE
+        @cloud_init        = UNSET_VALUE
 
       end
 
@@ -35,11 +43,15 @@ module VagrantPlugins
         @password = nil if @password == UNSET_VALUE
         @insecure = false if @insecure == UNSET_VALUE
         @debug = false if @debug == UNSET_VALUE
-        @cpus = 1 if @cpus == UNSET_VALUE
+        @cpu_cores = 1 if @cpu_cores == UNSET_VALUE
+        @cpu_sockets = 1 if @cpu_sockets == UNSET_VALUE
+        @cpu_threads = 1 if @cpu_threads == UNSET_VALUE
         @cluster = nil if @cluster == UNSET_VALUE
         @console = nil if @console == UNSET_VALUE
-        @memory = 256 if @memory == UNSET_VALUE
+        @memory_size = 256 if @memory_size == 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
 
       end
 

data/lib/vagrant-ovirt4/version.rb

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

data/spec/vagrant-ovirt4/config_spec.rb

@@ -28,21 +28,25 @@ describe VagrantPlugins::OVirtProvider::Config do
       end
     end
 
-    its("url")        { should be_nil }
-    its("username")   { should be_nil }
-    its("password")   { should be_nil }
-    its("insecure")   { should == false }
-    its("debug")      { should == false }
-    its("cpus")       { should == 1 }
-    its("cluster")    { should be_nil }
-    its("console")    { should be_nil }
-    its("template")   { should be_nil }
-    its("memory")     { should == 256 }
+    its("url")               { should be_nil }
+    its("username")          { should be_nil }
+    its("password")          { should be_nil }
+    its("insecure")          { should == false }
+    its("debug")             { should == false }
+    its("cpu_cores")         { should == 1 }
+    its("cpu_sockets")       { should == 1 }
+    its("cpu_threads")       { should == 1 }
+    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("cloud_init")        { should be_nil }
 
   end
 
   describe "overriding defaults" do
-    [:url, :username, :password, :insecure, :debug, :cpus, :cluster, :console, :template, :memory].each do |attribute|
+    [:url, :username, :password, :insecure, :debug, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :memory_size, :memory_guaranteed, :cloud_init].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")

data/test.rb

@@ -0,0 +1,3 @@
+require 'ovirt-engine-sdk'
+
+p 'foo'

data/tools/prepare_redhat_for_box.sh

@@ -27,7 +27,7 @@ echo "* Found RedHat ${RHEL_MAJOR_VERSION} version."
 
 ATOMIC=false
 which yum >/dev/null 2>&1
-[[ $? -eq 0 ]] && ATOMIC=true
+[[ $? -ne 0 ]] && ATOMIC=true
 
 # Setup hostname vagrant-something.
 FQDN="$1.vagrantup.com"
@@ -40,6 +40,9 @@ fi
 
 # Enable EPEL and Puppet repositories.
 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 \
@@ -61,7 +64,8 @@ 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 cloud-init \
+  iptables-services net-tools
 fi
 
 chkconfig sshd on

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -41,8 +41,10 @@ files:
 - ".rspec"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box
@@ -56,6 +58,7 @@ files:
 - lib/vagrant-ovirt4/action/halt_vm.rb
 - lib/vagrant-ovirt4/action/is_created.rb
 - lib/vagrant-ovirt4/action/is_running.rb
+- lib/vagrant-ovirt4/action/message_already_created.rb
 - lib/vagrant-ovirt4/action/message_already_up.rb
 - lib/vagrant-ovirt4/action/message_not_created.rb
 - lib/vagrant-ovirt4/action/message_not_suspended.rb
@@ -64,6 +67,7 @@ files:
 - lib/vagrant-ovirt4/action/message_saving_state.rb
 - lib/vagrant-ovirt4/action/read_ssh_info.rb
 - lib/vagrant-ovirt4/action/read_state.rb
+- lib/vagrant-ovirt4/action/resize_disk.rb
 - lib/vagrant-ovirt4/action/set_name_of_domain.rb
 - lib/vagrant-ovirt4/action/snapshot_delete.rb
 - lib/vagrant-ovirt4/action/snapshot_list.rb
@@ -74,6 +78,7 @@ files:
 - lib/vagrant-ovirt4/action/wait_til_suspended.rb
 - lib/vagrant-ovirt4/action/wait_till_down.rb
 - lib/vagrant-ovirt4/action/wait_till_up.rb
+- lib/vagrant-ovirt4/cap/nic_mac_addresses.rb
 - lib/vagrant-ovirt4/cap/snapshot_list.rb
 - lib/vagrant-ovirt4/cap/snapshot_save.rb
 - lib/vagrant-ovirt4/config.rb
@@ -97,6 +102,7 @@ files:
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
+- test.rb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
 homepage: https://github.com/myoung34/vagrant-ovirt4
@@ -119,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy