vagrant-vbguest 0.23.0 → 0.24.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de7e56db32055d21a641c0fff261a9dbff9f7faf6d1857b5eb5da239b7cbe0d6
-  data.tar.gz: 332c697c6db4673e288874aeaf61ecd65233256a40635ea81216019f4269396a
+  metadata.gz: ee59eb428fab8a82265073af563afac3cf1eb44ef7c39d7b295006f296541b28
+  data.tar.gz: 7cbf7aebdef759adaabd66ad72db101cfe777150348809188c6dfa8021a20163
 SHA512:
-  metadata.gz: f1041e643b17bce30c935e3c753dcb05c54b90e51edfd2de1844ccba5656d721837a9b0d7955d99dfd271810f2cb36355d03bed21714e52e43c8cf7161ec5174
-  data.tar.gz: b7a8fba5885fbca588c44dcf112eeacdd7b92604cb33378e1f59e75ab60bdfdab6c0d037a8cf725214eb3c01e3ea5c5a5b56d1f0f9e4ec149abad46f7a849fea
+  metadata.gz: 25a9d0bdd3d5f8abe459aae553b2074f3222550a14a82df5e774274d5be67c0c3ac16831064e9f1f1a8e1ac86deab89d38944cecd3aebf56fa4ca8c600c54e30
+  data.tar.gz: 28edf44b31602f72df2c2458a51b9f414561af4ea06b1674bd02f2793044b9294512135be8935b7b6461c365633b185e0f9901be6996060b8273faba394a4fa1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.24.0.beta1 (2020-04-28)
+
+- Add a new configuration `installer_options`, as an optional way to pass options to Installer classes.
+- Add new `installer_options` for the CentOS Installer. Thanks @pedrofurtado for [GH-373]
+  + `allow_kernel_upgrade`: Will update the kernel and reboots the box
+  + `reboot_timeout`: Optionally, set the max amount of seconds to wait after reboot
+
 ## 0.23.0 (2020-01-05)
 
 - Fix Oracle Linux Installer. Installs `elfutils-libelf-devel`. [GH-364], @fribeiro1 [GH-365]

data/Gemfile

@@ -11,7 +11,7 @@ group :development do
   else
     gem "vagrant", :git => "https://github.com/hashicorp/vagrant.git"
   end
-  gem "rake", "~> 10.0"
+  gem "rake", ">= 12.3.3"
 end
 
 group :plugins do

data/Readme.md

@@ -58,8 +58,28 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 * `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
 * `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class
 * `installer_arguments` (Array, default: `['--nox11']`) : List of additional arguments to pass to the installer. eg: `%w{--nox11 --force}` would execute `VBoxLinuxAdditions.run install --nox11 --force`
+* `installer_options` (Hash, default: `{}`) : Configure how a Installer internally works. Should be set on a `vm` level.
 * `yes` (Boolean or String, default: `true`): Wheter to pipe `yes` to the installer. If `true`, executes `yes | VBoxLinuxAdditions.run install`. With `false`, the command is executed without `yes`. You can also put in a string here for `yes` (e.g. `no` to refuse all messages)
 
+
+#### Installer Specific Options (`installer_options`)
+
+Those settings are specific for OS-specific installer. Especially in a multi-box environment, you should put those options on the box configuration like this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "my_cent_os_box" do |c|
+    c.box = "centos/8"
+    c.vbguest.installer_options = { allow_kernel_upgrade: true }
+  end
+end
+```
+
+##### CentOS
+
+* `:allow_kernel_upgrade` (default: `false`): If `true`, instead of trying to find matching the matching kernel-devel package to the installed kernel version, the kernel will be updated and the (now matching) up-to-date kernel-devel will be installed. __NOTE__: This will trigger a reboot of the box.
+* `:reboot_timeout` (default: `300`): Number of seconds to wait for the box to reboot after a kernel upgrade.
+
 #### Global Configuration
 
 Using [Vagrantfile Load Order](https://www.vagrantup.com/docs/vagrantfile/#load-order-and-merging) you may change default configuration values.

data/VERSION

@@ -1 +1 @@
-0.23.0
+0.24.0.beta1

data/lib/vagrant-vbguest/config.rb

@@ -4,7 +4,8 @@ module VagrantVbguest
 
     module Attributes
       attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,
-                    :installer, :installer_arguments, :allow_downgrade,
+                    :installer, :installer_arguments, :installer_options,
+                    :allow_downgrade,
                     :iso_path, :iso_upload_path, :iso_mount_point, :yes
     end
 
@@ -16,6 +17,7 @@ module VagrantVbguest
       def no_install;  @no_install.nil?  ? false : @no_install  end
       def no_remote;   @no_remote.nil?   ? false : @no_remote   end
       def installer_arguments; @installer_arguments.nil? ? '--nox11' : @installer_arguments end
+      def installer_options; @installer_options ||= {} end
       def yes; @yes.nil? ? true : @yes end
 
       def iso_path
@@ -33,6 +35,7 @@ module VagrantVbguest
     def no_install;  @no_install.nil?  ? self.class.no_install  : @no_install  end
     def no_remote;   @no_remote.nil?   ? self.class.no_remote   : @no_remote   end
     def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments : @installer_arguments end
+    def installer_options; @installer_options ||= self.class.installer_options end
     def yes; @yes.nil? ? self.class.yes : @yes end
 
     def iso_path
@@ -47,6 +50,7 @@ module VagrantVbguest
       {
         :installer => installer,
         :installer_arguments => installer_arguments,
+        :installer_options => installer_options,
         :iso_path => iso_path,
         :iso_upload_path => iso_upload_path,
         :iso_mount_point => iso_mount_point,

data/lib/vagrant-vbguest/installers/base.rb

@@ -181,6 +181,10 @@ module VagrantVbguest
         version
       end
 
+      def installer_options
+        options[:installer_options] || {}
+      end
+
       # Helper to yield a warning message to the user, that the installation
       # will start _now_.
       # The message includes the host and installer version strings.

data/lib/vagrant-vbguest/installers/centos.rb

@@ -8,12 +8,27 @@ module VagrantVbguest
 
       # Install missing deps and yield up to regular linux installation
       def install(opts=nil, &block)
-        install_kernel_deps(opts, &block)
+        if upgrade_kernel?
+          upgrade_kernel(opts, &block)
+        else
+          install_kernel_deps(opts, &block)
+        end
         super
       end
 
+      def installer_options
+        @installer_options ||= {
+          allow_kernel_upgrade: false,
+          reboot_timeout: 300
+        }.merge!(super)
+      end
+
       protected
 
+      def upgrade_kernel?
+        installer_options[:allow_kernel_upgrade]
+      end
+
       def install_kernel_deps(opts=nil, &block)
         unless has_kernel_devel_info?
           update_release_repos(opts, &block)
@@ -58,12 +73,26 @@ module VagrantVbguest
         communicate.sudo(cmd, opts, &block)
       end
 
+      def upgrade_kernel(opts=nil, &block)
+        communicate.sudo('yum update -y kernel', opts, &block)
+        communicate.sudo('yum install -y kernel-devel', opts, &block)
+
+        env.ui.info(I18n.t("vagrant_vbguest.centos.rebooting", vm_name: vm.name))
+        communicate.sudo('shutdown -r now', opts, &block)
+
+        sleep_guard = installer_options[:reboot_timeout]
+        begin
+          sleep 10
+          sleep_guard -= 10
+        end while sleep_guard >= 0 && !@vm.communicate.ready?
+      end
+
       def dependencies
-        if has_kernel_devel_info?
+        if !upgrade_kernel? && has_kernel_devel_info?
           # keep the original redhat dependencies
           super
         else
-          # we should have installed kernel-devel-`uname -r` via install_kernel_devel
+          # we should have installed kernel-devel(-`uname -r`) via install_kernel_devel or upgrade_kernel
           ['gcc', 'binutils', 'make', 'perl', 'bzip2', 'elfutils-libelf-devel'].join(' ')
         end
       end

data/lib/vagrant-vbguest/installers/debian.rb

@@ -24,7 +24,7 @@ module VagrantVbguest
 
     protected
       def install_dependencies_cmd
-        "apt-get install -y #{dependencies}"
+        "DEBIAN_FRONTEND=noninteractive apt-get install -y #{dependencies}"
       end
 
       def dependencies

data/locales/en_centos.yml

@@ -0,0 +1,4 @@
+en:
+  vagrant_vbguest:
+    centos:
+      rebooting: "[%{vm_name}] Rebooting after kernel upgrade."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0.beta1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -101,6 +101,7 @@ files:
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb
 - locales/en.yml
+- locales/en_centos.yml
 - locales/en_windows.yml
 - vagrant-vbguest.gemspec
 homepage: https://github.com/dotless-de/vagrant-vbguest