vagrant-ovirt4 1.2.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a27827fdc957c72739e7370205f87421bdc11bb2
-  data.tar.gz: 696f0b8fa78127ca5ff3822b3f5ed1308118c9d8
+SHA256:
+  metadata.gz: 032a8a924b7d7f1870fc319f4d4ed13f33910d0bb6bccde70fce977f25c8cafd
+  data.tar.gz: d3495cebef0d0daf9c5d2d9bbd09a3c271844844c4a334258049dc55a0f31062
 SHA512:
-  metadata.gz: cec6cf0493c478586ae46a5d4206908763e5ad1689b511afce420216f25e5eaf712f2d94b471bd7bdc5c35806f77da6a296fe4ae4ea9ac71675bd99241c07bb4
-  data.tar.gz: 7a03e6879022c4f263c46e42ae2accc102726830d7b5349159e7f30d32ada547c03188ea06757c347efac169cd144f7242f7aabb0b6d66a177fc7a32f416ac86
+  metadata.gz: 9b04cf43df3269c745ffb0bb7d503f9f192da7e3b7939d2b2428e3597684e4ed6dbebca051c16ff20529415f4a85ea506070658d84089e47bf9fbf9e16ae8c28
+  data.tar.gz: e6f60e4dbb661bcfa8cc39f8cd0fcb4633949490abf8910a5fc8f792c9ef45451aff4d6aed449e4e52e7d1cb020f6327a1dcf2d4743a1a342463263cf114782c

data/.github/FUNDING.yml

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

data/.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+
+on:
+  push:
+    paths:
+      - lib/vagrant-ovirt4/version.rb
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: fregante/setup-git-user@v1
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/.gitignore

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

data/CHANGELOG

@@ -0,0 +1,31 @@
+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/Dockerfile

@@ -0,0 +1,11 @@
+FROM ruby:2.2.6
+ARG jenkins_uid=997
+ARG jenkins_gid=994
+ENV JENKINS_UID=$jenkins_uid
+ENV JENKINS_GID=$jenkins_gid
+RUN apt-get update && apt-get install -y sudo
+RUN groupadd -g $JENKINS_GID  jenkins
+RUN useradd jenkins -u $JENKINS_UID -g $JENKINS_GID --shell /bin/bash --create-home
+RUN echo '%jenkins ALL=NOPASSWD: ALL' >> /etc/sudoers
+RUN chown -R :jenkins /usr/local/bundle /usr/local/bin
+USER jenkins

data/Gemfile

@@ -1,16 +1,15 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/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 'rake-release'
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,140 +1,149 @@
 GIT
-  remote: git://github.com/mitchellh/vagrant.git
-  revision: b223380c86680a0a22caa7c288055411faa4a072
+  remote: https://github.com/hashicorp/vagrant.git
+  revision: 22795b161bf67a4c0ebbe32c9ce8777cb888c4a7
   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)
+    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)
-      net-scp (~> 1.1.0)
-      net-sftp (~> 2.1)
-      net-ssh (~> 3.0.1)
-      nokogiri (= 1.6.7.1)
+      mime (~> 0.4.4)
+      net-scp (~> 1.2.0)
+      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.1.0)
+    vagrant-ovirt4 (2.1.0)
       filesize (~> 0)
-      ovirt-engine-sdk (~> 4.0, >= 4.0.6)
+      nokogiri (~> 1)
+      ovirt-engine-sdk (~> 4)
 
 GEM
   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)
+    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.8)
+    diff-lcs (1.4.4)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    ffi (1.9.17)
-    filesize (0.1.1)
-    gssapi (1.2.0)
+    ed25519 (1.2.4)
+    erubi (1.10.0)
+    ffi (1.15.0)
+    filesize (0.2.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.4)
+    hashicorp-checkpoint (0.1.5)
     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)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    listen (3.5.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.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)
+    mime-types-data (3.2021.0225)
+    mini_portile2 (2.5.0)
+    multi_json (1.15.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    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.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nori (2.6.0)
-    ovirt-engine-sdk (4.1.2)
-      json
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
+    ovirt-engine-sdk (4.4.1)
+      json (>= 1, < 3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.8.0)
+      byebug (~> 11.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)
+    racc (1.5.2)
+    rake (13.0.3)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rb-kqueue (0.2.6)
       ffi (>= 0.5.0)
-    rest-client (2.0.0)
+    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)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.10.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     ruby_dep (1.3.1)
-    rubyntlm (0.6.1)
-    rubyzip (1.2.1)
-    slop (3.6.0)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.7)
+    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
@@ -145,10 +154,12 @@ DEPENDENCIES
   pry
   pry-byebug
   rake
-  rspec
+  rake-release
+  rspec-core
   rspec-its
+  rspec-mocks (~> 3.5)
   vagrant!
   vagrant-ovirt4!
 
 BUNDLED WITH
-   1.14.4
+   1.17.2

data/README.md

@@ -56,13 +56,19 @@ $ vagrant up --provider=ovirt4
 ```
 Vagrant.configure("2") do |config|
   config.vm.box = 'ovirt4'
-  config.vm.hostname = "foo" 
+  config.vm.hostname = "foo"
   config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
 
   config.vm.network :private_network,
     :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,14 +76,18 @@ Vagrant.configure("2") do |config|
     ovirt.password = "password"
     ovirt.insecure = true
     ovirt.debug = true
+    ovirt.filtered_api = true #see http://www.ovirt.org/develop/release-management/features/infra/user-portal-permissions/
     ovirt.cluster = 'Default'
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
+    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
+    ovirt.bios_serial = aaabbbb-ccc-dddd
+    ovirt.optimized_for = 'server'
     ovirt.cloud_init =<<EOF
 write_files:
   - content: |
@@ -86,6 +96,8 @@ write_files:
     permissions: '0644'
 EOF
 
+    # additional disks
+    ovirt.storage :file, size: "8 GiB", type: 'qcow2', storage_domain: "mystoragedomain"
   end
 end
 ```
@@ -107,7 +119,6 @@ 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. `datacenter` => The name of the ovirt datacenter to create within. Required. String. No Default value.
   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.
@@ -119,6 +130,12 @@ end
   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.
+  1. `bios_serial` => The BIOS serial number to assign. Optional.
+  1. `optimized_for` => The "optimized for" setting. Can be one of 'Desktop' or 'Server' (case insensitive). Optional.
+  1. `storage` => adds a new storage disk to the VM
+    a. `size`: the size of the disk
+    a. `type`: the type of disk. It can be either `qcow2` or `raw`
+    a. `storage_domain`: the storage domain where the disk should be created
 
 
 ## Contributing
@@ -128,3 +145,10 @@ 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
+
+Some pointers:
+
+* To install the requirements when developing:
+    * `bundle install`
+* To run the test suite:
+    * `bundle exec rspec spec/`

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rake/release'
 require 'rspec/core/rake_task'
 
 # Immediately sync all stdout so that tools like buildbot can
@@ -13,10 +14,3 @@ Dir.chdir(File.expand_path("../", __FILE__))
 # This installs the tasks that help with gem creation and
 # 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
-# Default task is to run the unit tests
-task :default => :spec