vagrant-ovirt4 1.2.3 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0791674c10129bc4c799c0edc0a69688c5afad9bf97d5330c8dbfd804fc303
-  data.tar.gz: ff664c4cf2241450255854076a784cade3b519143e27c96cfe202f1af8bbb456
+  metadata.gz: 7f8d267202b71616a27bf1a4b721fe29264a7128d7643d0059a0558a3a6d76c8
+  data.tar.gz: 4dfc4ee00d4dfef59a9a9acf0e4639bdcd86bf4f030de479e6e0c526eb088441
 SHA512:
-  metadata.gz: 462531777be650d20de06a80c170d435733e62b42e60aa52600e9f52a72a36dd407be247682b68dccc8fad93b8b7d71c42c0f89f2734637be7e79c996f63fc9b
-  data.tar.gz: 7d5c64d01517722e218f6aed6110c47fcb60aa50fc6f00d2b66e5c1e55f5e84494bd961255524b9fe950b4dbd77e0356075069e0d78b0afe5ddedaf46da25571
+  metadata.gz: 013cbee883c91387751dcb150c4cae7af3e73275845d67f9019e6b508564ad756adc48d8d6d84b721188bd631e006511a58928c3e44b34b0086deac8a50d2d74
+  data.tar.gz: b281f7740fbc84ca12bc8c81a95a6b1ebfeeaa4246c0726384b389a0130716291bf3d859650fcc697a22a7f97a671e114745e403a0b5bb27137b24197e6dc3a5

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: myoung34

data/.gitignore

@@ -6,5 +6,4 @@
 /.idea
 *.gem
 /manifests
-hiera.yaml
-.kitchen
+vendor

data/CHANGELOG

@@ -0,0 +1,50 @@
+v2.1.2
+79a0074 Fix lock file
+
+v2.1.1
+605663e Bump nokogiri from 1.13.3 to 1.13.4
+2981f5c Default to disabling run-once mode
+f048313 Enable oVirt conn debugging when VAGRANT_LOG=info
+3555e36 Add safe connection closing methods
+cdb765c Support :timeout and :timeout_connect options
+tomeon/test-all-vmtype-andvmaffinity-values
+2a9a653 Rakefile: add RSpec task
+7641780 test all valid VmType and VmAffinity values
+54efcde Add tests for vmname and hostname settings
+dc3ab3e Add "vmname" provider option
+233e4bb read_ssh_info: return nil on IPv4 lookup failure
+fcff147 Bump nokogiri from 1.12.5 to 1.13.3
+da44f24 Bump nokogiri from 1.11.4 to 1.12.5
+9025f4e Bump nokogiri from 1.11.3 to 1.11.4
+
+v2.1.0
+41b8c63 Move where rspec-mocks is included.
+0015c45 Update engine binding.
+b2a0015 Not actually using the vagrant-spec thing.
+a598043 Address the change in parsing.
+0ad3b72 Get the tests runnable.
+a8f1d5f Test the connection before passing it on for use.
+8adf277 list only snapshots for vm's defined in the environment
+a2ee89b Add security.md
+3399aab Add CHANGELOG
+
+v2.0.0
+
+1810832 Attempt to fix gem push
+9d1ef6b handle fallback with rescue
+6cc0f90 fix for backwards compatibility with ovirt 4.3
+2298314 Make no assumptions on biosdevname/systemd device naming
+1d870df Support for network interfaces named by biosdevname
+5c8035a add missing translation
+f9b6e28 fixed double disconnect due to action_up used in combination wth with_ovirt
+96f17c0 fixed doule disconnect on reload due to use of with_ovirt
+697e3d4 fixed inconsistent usages of memory units (MB/MiB and GB/GiB)
+5a68e8b vagrant destroy only calls halt if vm is up
+8772ee9 fix for erroneous rsync and state error due to missing ip address
+5b49114 Bump nokogiri from 1.10.9 to 1.11.0
+b8314fb fix for waiting indefinitely for an ip when deploying on ovirt 4.4
+722f2e0 Default to rsync instead of NFS like before
+2582f53 Use vagrant builtin rsync folder sync
+84c6c53 In case graceful shutdown failed, fallback to stopping VM immediately
+640d640 Fix up dependencies
+029b53b give guests a chance to shutdown gracefully before pulling the plug with a poweroff

data/Gemfile

@@ -1,20 +1,15 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/myoung34/vagrant.git'
+  gem 'rake'
+  gem 'rspec-core'
+  gem 'rspec-its'
+  gem "rspec-mocks", "~> 3.5"
   gem 'pry'
   gem 'byebug'
   gem 'pry-byebug'
-end
-
-group :testing do
-  gem 'rspec-its'
-  gem 'rspec'
-  gem 'rake'
-  gem 'kitchen-vagrant'
-  gem 'kitchen-inspec'
-  gem 'test-kitchen'
-  gem 'net-scp', "~>1.2"
+  gem 'rake-release'
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,211 +1,149 @@
 GIT
-  remote: git://github.com/myoung34/vagrant.git
-  revision: 4572267c33f4ba569f68ad4bff026e9a7ef63b56
+  remote: https://github.com/hashicorp/vagrant.git
+  revision: 22795b161bf67a4c0ebbe32c9ce8777cb888c4a7
   specs:
-    vagrant (1.9.3.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)
+    vagrant (2.2.11.dev)
+      bcrypt_pbkdf (~> 1.0.0)
+      childprocess (~> 4.0.0)
+      ed25519 (~> 1.2.4)
+      erubi
+      hashicorp-checkpoint (~> 0.1.5)
+      i18n (~> 1.8)
+      listen (~> 3.1)
       log4r (~> 1.1.9, < 1.1.11)
+      mime (~> 0.4.4)
       net-scp (~> 1.2.0)
-      net-sftp (~> 2.1)
-      net-ssh (~> 3.0.1)
-      nokogiri (= 1.6.7.1)
+      net-sftp (~> 3.0)
+      net-ssh (~> 6.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
+      rubyzip (~> 2.0)
+      vagrant_cloud (~> 2.0.3)
       wdm (~> 0.1.0)
-      winrm (~> 2.1)
-      winrm-elevated (~> 1.1)
-      winrm-fs (~> 1.0)
+      winrm (>= 2.3.4, < 3.0)
+      winrm-elevated (>= 1.2.1, < 2.0)
+      winrm-fs (>= 1.3.4, < 2.0)
 
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.2.1)
+    vagrant-ovirt4 (2.1.3)
       filesize (~> 0)
-      ovirt-engine-sdk (~> 4.0.1)
+      nokogiri (~> 1)
+      ovirt-engine-sdk (~> 4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artifactory (2.7.0)
-    blankslate (2.1.2.4)
-    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)
-    docker-api (1.33.2)
-      excon (>= 0.38.0)
-      json
-    domain_name (0.5.20170223)
+    bcrypt_pbkdf (1.0.1)
+    builder (3.2.4)
+    byebug (11.1.3)
+    childprocess (4.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    excon (0.71.0)
-    faraday (0.11.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
-    filesize (0.1.1)
-    gssapi (1.2.0)
+    ed25519 (1.2.4)
+    erubi (1.10.0)
+    ffi (1.15.5)
+    filesize (0.2.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.4)
-    hashie (3.5.5)
-    http-cookie (1.0.3)
+      rexml (~> 3.0)
+    hashicorp-checkpoint (0.1.5)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.8.0)
-    inspec (1.15.0)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      json (>= 1.8, < 3.0)
-      method_source (~> 0.8)
-      mixlib-log
-      parallel (~> 1.9)
-      pry (~> 0)
-      rainbow (~> 2)
-      rspec (~> 3)
-      rspec-its (~> 1.2)
-      rspec_junit_formatter (~> 0.2.3)
-      rubyzip (~> 1.1)
-      sslshake (~> 1)
-      thor (~> 0.19)
-      toml (~> 0.1)
-      train (>= 0.22.0, < 1.0)
-    json (2.0.3)
-    kitchen-inspec (0.17.0)
-      hashie (~> 3.4)
-      inspec (>= 0.34.0, < 2.0.0)
-      test-kitchen (~> 1.6)
-    kitchen-vagrant (1.0.2)
-      test-kitchen (~> 1.4)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (2.1.0)
+    logging (2.3.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    method_source (0.8.2)
-    mime-types (3.1)
+      multi_json (~> 1.14)
+    method_source (1.0.0)
+    mime (0.4.4)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.0.0)
-    mixlib-install (2.1.12)
-      artifactory
-      mixlib-shellout
-      mixlib-versioning
-      thor
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-versioning (1.1.0)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
+    mime-types-data (3.2022.0105)
+    multi_json (1.15.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.13.4-x86_64-darwin)
+      racc (~> 1.4)
     nori (2.6.0)
-    ovirt-engine-sdk (4.0.12)
-      json
-    parallel (1.10.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rainbow (2.2.1)
-    rake (13.0.1)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
+    ovirt-engine-sdk (4.4.1)
+      json (>= 1, < 3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    racc (1.6.0)
+    rake (13.0.6)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.4)
-      ffi (>= 0.5.0)
-    rest-client (2.0.1)
+    rest-client (2.0.2)
       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)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rexml (3.2.5)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.11.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     ruby_dep (1.3.1)
-    rubyntlm (0.6.1)
-    rubyzip (1.3.0)
-    safe_yaml (1.0.4)
-    slop (3.6.0)
-    sslshake (1.0.13)
-    test-kitchen (1.15.0)
-      mixlib-install (>= 1.2, < 3.0)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.18)
-    thor (0.19.4)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    train (0.22.1)
-      docker-api (~> 1.26)
-      json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.8.1)
+    vagrant_cloud (2.0.3)
+      rest-client (~> 2.0.2)
     wdm (0.1.1)
-    winrm (2.1.2)
+    winrm (2.3.6)
       builder (>= 2.1.2)
-      erubis (~> 2.7)
+      erubi (~> 1.8)
       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)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
-      erubis (~> 2.7)
+    winrm-fs (1.3.5)
+      erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
+      rubyzip (~> 2.0)
       winrm (~> 2.0)
 
 PLATFORMS
@@ -213,17 +151,15 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  kitchen-inspec
-  kitchen-vagrant
-  net-scp (~> 1.2)
   pry
   pry-byebug
   rake
-  rspec
+  rake-release
+  rspec-core
   rspec-its
-  test-kitchen
+  rspec-mocks (~> 3.5)
   vagrant!
   vagrant-ovirt4!
 
 BUNDLED WITH
-   1.14.4
+   1.17.2

data/README.md

@@ -1,3 +1,5 @@
+[OvirtSDK4::Connection#initialize]: https://rubydoc.info/gems/ovirt-engine-sdk/OvirtSDK4%2FConnection:initialize
+
 # Vagrant oVirt v4 Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
@@ -63,6 +65,12 @@ Vagrant.configure("2") do |config|
     :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'
+    # Static configuration with biosdevname. Guest OS assigns interface names (ens3, em1 or something else). ovirt__interface_name has to match that name.
+    #: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', :ovirt__interface_name => 'ens3'
+
+#  configure additional interface
+#  config.vm.network :private_network,
+#    :ovirt__ip => '192.168.2.199', :ovirt__network_name => 'ovirtmgmt', :ovirt__netmask => '255.255.0.0', :ovirt__interface_name => 'ens4'
 
   config.vm.provider :ovirt4 do |ovirt|
     ovirt.url = 'https://server/ovirt-engine/api'
@@ -70,13 +78,17 @@ Vagrant.configure("2") do |config|
     ovirt.password = "password"
     ovirt.insecure = true
     ovirt.debug = true
+    ovirt.timeout = 120 # seconds
+    ovirt.connect_timeout = 30 # seconds
     ovirt.filtered_api = true #see http://www.ovirt.org/develop/release-management/features/infra/user-portal-permissions/
     ovirt.cluster = 'Default'
+    ovirt.vmname = 'my-vm'
+    ovirt.run_once = false
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
-    ovirt.disk_size = '15 GB' # only growing is supported. works the same way as below memory settings
+    ovirt.disk_size = '15 GiB' # only growing is supported. works the same way as below memory settings
     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.memory_guaranteed = '256 MiB' #see https://github.com/dominikh/filesize for usage
     ovirt.cpu_cores = 2
     ovirt.cpu_sockets = 2
     ovirt.cpu_threads = 2
@@ -99,8 +111,8 @@ end
 ### Configuration options
 
 1. Vagrant specific
-  1. `config.vm.hostname` => Sets the hostname of the VM
-    a. Is the 'name' in the Virtual Machine tab of the UI
+  1. `config.vm.hostname` => Sets the hostname of the VM. Optional. String.
+     Default is `"vagrant"`.
     a. Is the 'hostname' of the VM configured by `cloud-init`
   1. `config.vm.network` => Sets the network information of the VM.
     a. Note: `:ip` => is ignored, but `:ovirt__ip` is used and merged with `:ip`
@@ -112,7 +124,22 @@ end
   1. `username` => The username for the API. Required. String. No default value.
   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. `debug` => Turn on additional log statements. Optional. Bool. Default is
+     `true` if Vagrant's logging verbosity is set to `info` or above
+     (`VAGRANT_LOG={info,debug,...}`); otherwise, the default is `false`.
+  1. `timeout` => Per [the oVirt SDK docs][OvirtSDK4::Connection#initialize],
+     "The maximun (_sic_) total time to wait for the response, in seconds. A value of
+     zero (the default) means wait for ever." Optional. Integer. Uses the
+     `OvirtSDK4::Connection` default if omitted; as of the time of writing,
+     this is `0` (i.e. wait forever).
+  1. `connect_timeout` => Per [the oVirt SDK docs][OvirtSDK4::Connection#initialize],
+     "The maximun (_sic_) time to wait for connection establishment, in
+     seconds." Optional. Integer. Uses the `OvirtSDK4::Connection` default if
+     omitted; as of the time of writing, this is `300`.
+  1. `vmname` => Sets the name of the VM. Optional. String. Default is
+     `config.vm.hostname`, if defined, otherwise `"vagrant"`.
+    a. Is the 'name' in the Virtual Machine tab of the UI
+  1. `run_once` => Launch VM in run-once mode. Optional. Default is `false`.
   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.
@@ -132,25 +159,6 @@ end
     a. `storage_domain`: the storage domain where the disk should be created
 
 
-## Testing
-
-Currently pull-requests are tested via [test-kitchen using kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant).
-See [Jenkinsfile](Jenkinsfile) for more information.
-If you'd like to run them yourself, however, they make not work in all setups. For example they assume `192.168.2.0/24`, host pinning will probably not have a host that's in all set ups, and the template names might not match.
-
-To run Unit tests: `bundle install; bundle exec rspec`
-
-To run acceptance tests:
-
-```bash
-export OVIRT_URL='https://yoururl/ovirt-engine/api''
-export OVIRT_USERNAME='yourname@internal'
-export OVIRT_PASSWORD='yourpassword!'
-gem build *.gemspec
-vagrant plugin install *.gem
-bundle exec kitchen test all
-```
-
 ## Contributing
 
 1. Fork it
@@ -158,3 +166,10 @@ bundle exec kitchen test all
 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
+
+Some pointers:
+
+* To install the requirements when developing:
+    * `bundle install`
+* To run the test suite:
+    * `bundle exec rspec spec/`

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rake/release'
 require 'rspec/core/rake_task'
-require 'kitchen/rake_tasks'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
@@ -15,19 +15,6 @@ Dir.chdir(File.expand_path("../", __FILE__))
 # publishing.
 Bundler::GemHelper.install_tasks
 
-# Install the `spec` task so that we can run tests.
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--order defined"
-end
+RSpec::Core::RakeTask.new
 
-# Default task is to run all tests
-namespace :test do
-  task :all do
-    RSpec::Core::RakeTask.new(:spec)
-    Rake::Task["spec"].execute
-    Kitchen::RakeTasks.new
-    Rake::Task['kitchen:all'].invoke
-  end
-end
-
-task :default => 'test:all'
+task :default => [:spec]

data/SECURITY.md

@@ -0,0 +1,23 @@
+## Security
+
+If you believe you have found a security vulnerability, please report it to me as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.** Instead, please report them to me directly at [myoung34@my.apsu.edu](mailto:myoung34@my.apsu.edu).  
+
+If you'd like to communicate securely, my keybase is [here](https://keybase.io/3vilpenguin)
+
+Please include the requested information listed below (as much as you can provide) to help better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+## Preferred Languages
+
+I prefer all communications to be in English.

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

@@ -19,17 +19,39 @@ module VagrantPlugins
           conn_attr[:url] = "#{config.url}"
           conn_attr[:username] = config.username if config.username
           conn_attr[:password] = config.password if config.password
-          conn_attr[:debug] = config.debug if config.debug
           conn_attr[:insecure] = true if config.insecure
           conn_attr[:headers] = {'Filter' => true} if config.filtered_api
+          conn_attr[:timeout] = config.timeout unless config.timeout.nil?
+          conn_attr[:connect_timeout] = config.connect_timeout unless config.connect_timeout.nil?
 
-          @logger.info("Connecting to oVirt (#{config.url}) ...")
-          OVirtProvider.ovirt_connection = OvirtSDK4::Connection.new(conn_attr)          
-          OVirtProvider.vms_service = OVirtProvider.ovirt_connection.system_service.vms_service
-          env[:connection] = OVirtProvider.ovirt_connection
-          env[:vms_service] = OVirtProvider.vms_service
+          # Respect VAGRANT_LOG setting -- any level at least as verbose as
+          # "info" will result in logging oVirt connection debugging messages
+          # (read: libcurl verbose output).
+          conn_attr[:debug] = config.debug or @logger.info?
+
+          # Inject our own logger so that messages are namespaced under
+          # "connect_ovirt"
+          conn_attr[:log] = @logger
 
-          @app.call(env)
+          @logger.info("Connecting to oVirt (#{config.url}) ...")
+          ovirt_connection = OvirtSDK4::Connection.new(conn_attr)
+          vms_service = ovirt_connection.system_service.vms_service
+
+          # XXX: Continue setting deprecated global properties. Use of the
+          # related values from env should be preferred.
+          OVirtProvider.ovirt_connection = ovirt_connection
+          OVirtProvider.vms_service = vms_service
+
+          begin
+            ovirt_connection.test(true, 30)
+          rescue => error
+            raise Errors::ServiceConnectionError,
+              :error_message => error.message
+          else
+            env[:connection] = ovirt_connection
+            env[:vms_service] = vms_service
+            @app.call(env)
+          end
         end
 
       end