beaker-hostgenerator 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3beb95b4423193b2828d8597a74efef5fb23fa4
-  data.tar.gz: 878feb34f6e85b03dfdd60404cddeaed6c5394cc
+  metadata.gz: 23d2711d7c68ad2a05e15df506b5273fb4c32c27
+  data.tar.gz: 9f11eaaae060c2121c8ad96041b59f18f3659d66
 SHA512:
-  metadata.gz: 4b52d6d181f70851bb93d3d577eac8439bf7b4fbaa97acf682f5623dfa5584f832ca3e602298471ced4bfc66065f6f5a4e5f9ae11bce507b04367efdb0225158
-  data.tar.gz: b71653ad9f74b60f38fdb50807abbd1e0d6e24163320eec971689e8b92ab0d178896889df4e2f5c4c3bb5b4713076450c1d4aad43d7c3a35f4482982f69159cc
+  metadata.gz: 55c5345de3b032e22258a48c85c45fb7d9e09a07e55a57b1849470563c3c4bd477670e925d2cd392fc786ea76996651c88a0f57cc5f60513fae60a58f129682f
+  data.tar.gz: 78829a597042ca92fca5c20a74bf125d0a59fa3e6e283babf7a3ce8535c8698cd4274eee1e659bfe4e0217993368d1599a933a770103aac3cf9566c23a18ee8e

data/lib/beaker-hostgenerator/data.rb

@@ -297,6 +297,9 @@ module BeakerHostGenerator
               'apt-get update && apt-get install -y cron locales-all net-tools wget'
             ],
           },
+          :vagrant => {
+            'box' => 'debian/wheezy64',
+          },
           :vmpooler => {
             'template' => 'debian-7-x86_64'
           }
@@ -322,6 +325,9 @@ module BeakerHostGenerator
               'apt-get update && apt-get install -y cron locales-all net-tools wget'
             ]
           },
+          :vagrant => {
+            'box' => 'debian/jessie64',
+          },
           :vmpooler => {
             'template' => 'debian-8-x86_64'
           }
@@ -354,6 +360,9 @@ module BeakerHostGenerator
               'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv gnupg'
             ]
           },
+          :vagrant => {
+            'box' => 'debian/stretch64',
+          },
           :vmpooler => {
             'template' => 'debian-9-x86_64'
           }

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -46,6 +46,8 @@ module BeakerHostGenerator
     def self.builtin_hypervisors()
       {
         'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
+        'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant,
+        'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant,
         'docker' => BeakerHostGenerator::Hypervisor::Docker,
         'abs' => BeakerHostGenerator::Hypervisor::ABS
       }
@@ -96,5 +98,6 @@ end
 # hypervisor implementation files.
 require 'beaker-hostgenerator/hypervisor/unknown'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
+require 'beaker-hostgenerator/hypervisor/vagrant'
 require 'beaker-hostgenerator/hypervisor/docker'
 require 'beaker-hostgenerator/hypervisor/abs'

data/lib/beaker-hostgenerator/hypervisor/vagrant.rb

@@ -0,0 +1,32 @@
+require 'beaker-hostgenerator/data'
+require 'beaker-hostgenerator/hypervisor'
+require 'deep_merge'
+
+module BeakerHostGenerator
+  module Hypervisor
+    class Vagrant < BeakerHostGenerator::Hypervisor::Interface
+      include BeakerHostGenerator::Data
+
+      def generate_node(node_info, base_config, bhg_version)
+        base_config['hypervisor'] = 'vagrant'
+
+        if node_info['ostype'] =~ /^centos/
+          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
+        elsif node_info['ostype'] =~ /^fedora/
+          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + 'cloud-base'
+        else
+          base_config['box'] = "generic/#{node_info['ostype']}"
+        end
+
+        # We don't use this by default
+        base_config['synced_folder'] = 'disabled'
+
+        platform = node_info['platform']
+        platform_info = get_platform_info(bhg_version, platform, :vagrant)
+        base_config.deep_merge! platform_info
+
+        return base_config
+      end
+    end
+  end
+end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.1.21'
+    STRING = '1.1.22'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -221,6 +221,7 @@ files:
 - lib/beaker-hostgenerator/hypervisor/abs.rb
 - lib/beaker-hostgenerator/hypervisor/docker.rb
 - lib/beaker-hostgenerator/hypervisor/unknown.rb
+- lib/beaker-hostgenerator/hypervisor/vagrant.rb
 - lib/beaker-hostgenerator/hypervisor/vmpooler.rb
 - lib/beaker-hostgenerator/parser.rb
 - lib/beaker-hostgenerator/roles.rb