vagrant-ovirt4 1.1.0 → 2.0.0

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,11 @@ 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
+chkconfig NetworkManager off
+
 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,6 +120,13 @@ 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
+
+# Chef
+[[ $ATOMIC != "true" ]] && curl -L --silent https://omnitruck.chef.io/install.sh | bash
+
+
 # Do some cleanup..
 rm -f /root/.bash_history
 rm -f /root/authorized_keys

data/vagrant-ovirt4.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantPlugins::OVirtProvider::VERSION
 
-  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0', '>= 4.0.6'
+  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0.1'
+  gem.add_runtime_dependency 'filesize', '~> 0'
+  gem.add_runtime_dependency 'nokogiri', '>= 1.10.8'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -16,20 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 1.10.8
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -37,14 +59,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- docker-compose.yml
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box
@@ -55,6 +79,7 @@ files:
 - lib/vagrant-ovirt4/action/create_network_interfaces.rb
 - lib/vagrant-ovirt4/action/create_vm.rb
 - lib/vagrant-ovirt4/action/destroy_vm.rb
+- lib/vagrant-ovirt4/action/disconnect_ovirt.rb
 - lib/vagrant-ovirt4/action/halt_vm.rb
 - lib/vagrant-ovirt4/action/is_created.rb
 - lib/vagrant-ovirt4/action/is_running.rb
@@ -74,11 +99,9 @@ files:
 - lib/vagrant-ovirt4/action/snapshot_save.rb
 - lib/vagrant-ovirt4/action/start_vm.rb
 - lib/vagrant-ovirt4/action/suspend_vm.rb
-- lib/vagrant-ovirt4/action/sync_folders.rb
 - 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
@@ -102,7 +125,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
+- templates/Vagrantfile.erb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
 homepage: https://github.com/myoung34/vagrant-ovirt4
@@ -124,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 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

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

@@ -1,69 +0,0 @@
-require "log4r"
-require "vagrant/util/subprocess"
-
-module VagrantPlugins
-  module OVirtProvider
-    module Action
-      class SyncFolders
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_ovirt::action::sync_folders")
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            next if data[:disabled]
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths.
-            # assumes: /c/...
-            # Should be msysgit and cygwin compatible if /etc/fstab in cygwin contains:
-            #    none / cygdrive binary,posix=0,user 0 0
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/#{$1}" }
-            end
-
-            env[:ui].info(I18n.t("vagrant_ovirt4.rsync_folder", :hostpath => hostpath, :guestpath => guestpath))
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo("chown #{ssh_info[:username]} '#{guestpath}'")
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              "rsync", 
-              "--verbose", 
-              "--archive", 
-              "-z", 
-              "--owner", 
-              "--perms",
-              "--exclude", 
-              ".vagrant/",
-              "-e", 
-              "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path][0]}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"
-            ]
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,15 +0,0 @@
-# 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/test.rb

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