beaker-hostgenerator 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 989df830d08bfb7726aaf9ec65529668898cda03efe855b1627f31185c66680a
-  data.tar.gz: 274abeb00d5230dd22125fd8bfc4a50901a76dbd2cec5b2c646c1eae60aa28a3
+  metadata.gz: 132dc94d5189e4ca79255f915ed53ef895b607a82df75f01948ee1e3ae97d3d8
+  data.tar.gz: 75682b346b6d75f4a7bf457a0364919dc910698faa2ac7a318fdd1a2daae1824
 SHA512:
-  metadata.gz: b1edd1be82dfc67db26c277b95880df4da410cb90083f80d0a146e39b5104b4c3d62e0e4dd974d2fa333d78871bec3baa1c3128c3c4e9d1a4da1d14730f6d6db
-  data.tar.gz: 8768bc0e4ddbac23d5fe918943b4560d605f4dc6386ef100d07af508340b5f5052e849b55d1e1c4fafa0a28686770f5a56973ff0c003c8df7c94e92f3a97364c
+  metadata.gz: 3a3ee4782860c88a2f5717f5f0a1eb8e65686ca9c0e1b165cadb9154cc24234261a0a86477bfea4b548aae4db6e68e07a9832ef0ece0a88ebc57e5a3252e9854
+  data.tar.gz: 18b20b4d3b7f9bdc007b60afebdf2609e3bc2f9212b26953fb9fada146793d083e1ec602778c359d85381447f0ce18bdce4788a72097860c770db3d0917b2b10

data/CHANGELOG.md

@@ -2,6 +2,50 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.7.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.0) (2021-09-22)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.1...1.7.0)
+
+**Implemented enhancements:**
+
+- \(IMAGES-1302\) Add Alma and Rocky 8 support [\#226](https://github.com/voxpupuli/beaker-hostgenerator/pull/226) ([GabrielNagy](https://github.com/GabrielNagy))
+- Add RedHat 8 FIPS platform definition [\#224](https://github.com/voxpupuli/beaker-hostgenerator/pull/224) ([GabrielNagy](https://github.com/GabrielNagy))
+- Remove stringify-hash as a dependency [\#219](https://github.com/voxpupuli/beaker-hostgenerator/pull/219) ([ekohl](https://github.com/ekohl))
+
+## [1.6.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.1) (2021-08-26)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.0...1.6.1)
+
+**Fixed bugs:**
+
+- Debian 11 docker: Install iproute2 [\#222](https://github.com/voxpupuli/beaker-hostgenerator/pull/222) ([bastelfreak](https://github.com/bastelfreak))
+
+## [1.6.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.0) (2021-08-17)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.5.0...1.6.0)
+
+**Implemented enhancements:**
+
+- Generate Ubuntu ABS, vmpooler, and Docker templates on the fly [\#218](https://github.com/voxpupuli/beaker-hostgenerator/pull/218) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Set up Debian 11 on Docker [\#220](https://github.com/voxpupuli/beaker-hostgenerator/pull/220) ([ekohl](https://github.com/ekohl))
+
+## [1.5.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.5.0) (2021-06-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.4.0...1.5.0)
+
+**Implemented enhancements:**
+
+- Ensure amd64 containers are pulled when needed [\#214](https://github.com/voxpupuli/beaker-hostgenerator/pull/214) ([genebean](https://github.com/genebean))
+- Add Fedora 34 support [\#212](https://github.com/voxpupuli/beaker-hostgenerator/pull/212) ([GabrielNagy](https://github.com/GabrielNagy))
+
+**Fixed bugs:**
+
+- Fix oracle image name [\#215](https://github.com/voxpupuli/beaker-hostgenerator/pull/215) ([genebean](https://github.com/genebean))
+- Avoid activesupport deep\_merge conflict [\#213](https://github.com/voxpupuli/beaker-hostgenerator/pull/213) ([GabrielNagy](https://github.com/GabrielNagy))
+
 ## [1.4.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.4.0) (2021-05-11)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.3.0...1.4.0)

data/beaker-hostgenerator.gemspec

@@ -34,7 +34,4 @@ eos
 
   # Run time dependencies
   s.add_runtime_dependency 'deep_merge', '~> 1.0'
-  s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
-
 end
-

data/lib/beaker-hostgenerator/data.rb

@@ -83,7 +83,7 @@ module BeakerHostGenerator
       result = {}
 
       # Fedora
-      (19..33).each do |release|
+      (19..34).each do |release|
         # 32 bit support was dropped in Fedora 31
         if release < 31
           result["fedora#{release}-32"] = {
@@ -100,6 +100,55 @@ module BeakerHostGenerator
         }
       end
 
+      # Ubuntu
+      #
+      # Generate LTS platforms
+      (14..20).select(&:even?).each do |release|
+        # 32 bit support was dropped in Ubuntu 18.04
+        if release < 18
+          result["ubuntu#{release}04-32"] = {
+            :general => {
+              'platform' => "ubuntu-#{release}.04-i386"
+            }
+          }
+        end
+
+        result["ubuntu#{release}04-64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-amd64"
+          }
+        }
+
+        result["ubuntu#{release}04-POWER"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-ppc64el"
+          }
+        }
+
+        result["ubuntu#{release}04-AARCH64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.04-aarch64"
+          }
+        }
+      end
+
+      # Generate STS platforms
+      [20, 21].each do |release|
+        unless release.even?
+          result["ubuntu#{release}04-64"] = {
+            :general => {
+              'platform' => "ubuntu-#{release}.04-amd64"
+            }
+          }
+        end
+
+        result["ubuntu#{release}10-64"] = {
+          :general => {
+            'platform' => "ubuntu-#{release}.10-amd64"
+          }
+        }
+      end
+
       result.merge!({
         'aix53-POWER' => {
           :general => {
@@ -137,6 +186,17 @@ module BeakerHostGenerator
             'template' => 'aix-7.2-power'
           }
         },
+        'almalinux8-64' => {
+          :general => {
+            'platform' => 'el-8-x86_64',
+          },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
+            ]
+          }
+        },
         'amazon6-64' => {
             :general => {
                 'platform'           => 'el-6-x86_64',
@@ -592,6 +652,13 @@ module BeakerHostGenerator
             'platform'           => 'debian-11-amd64',
             'packaging_platform' => 'debian-11-amd64'
           },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'rm -f /usr/sbin/policy-rc.d',
+              'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg iproute2'
+            ]
+          },
           :vagrant => {
             'box' => 'debian/bullseye64',
           },
@@ -936,6 +1003,15 @@ module BeakerHostGenerator
             'template' => 'redhat-8-x86_64'
           }
         },
+        'redhatfips8-64' => {
+          :general => {
+            'platform'           => 'el-8-x86_64',
+            'packaging_platform' => 'redhatfips-8-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'redhat-fips-8-x86_64'
+          }
+        },
         'redhat8-AARCH64' => {
           :general => {
             'platform'           => 'el-8-aarch64',
@@ -957,6 +1033,17 @@ module BeakerHostGenerator
             'template' => 'redhat-8-power8'
           }
         },
+        'rocky8-64' => {
+          :general => {
+            'platform' => 'el-8-x86_64',
+          },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
+            ]
+          }
+        },
         'scientific5-32' => {
           :general => {
             'platform'           => 'el-5-i386',
@@ -1165,216 +1252,6 @@ module BeakerHostGenerator
             'template' => 'solaris-114-x86_64'
           }
         },
-        'ubuntu1004-32' => {
-          :general => {
-            'platform' => 'ubuntu-10.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1004-i386'
-          }
-        },
-        'ubuntu1004-64' => {
-          :general => {
-            'platform' => 'ubuntu-10.04-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1004-x86_64'
-          }
-        },
-        'ubuntu1204-32' => {
-          :general => {
-            'platform' => 'ubuntu-12.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1204-i386'
-          }
-        },
-        'ubuntu1204-64' => {
-          :general => {
-            'platform' => 'ubuntu-12.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget',
-              'locale-gen en_US.UTF-8'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1204-x86_64'
-          }
-        },
-        'ubuntu1404-32' => {
-          :general => {
-            'platform'           => 'ubuntu-14.04-i386',
-            'packaging_platform' => 'ubuntu-14.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1404-i386'
-          }
-        },
-        'ubuntu1404-64' => {
-          :general => {
-            'platform'           => 'ubuntu-14.04-amd64',
-            'packaging_platform' => 'ubuntu-14.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'rm /usr/sbin/policy-rc.d',
-              'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl',
-              'apt-get install -y net-tools wget apt-transport-https',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1404-x86_64'
-          }
-        },
-        'ubuntu1504-32' => {
-          :general => {
-            'platform' => 'ubuntu-15.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1504-i386'
-          }
-        },
-        'ubuntu1504-64' => {
-          :general => {
-            'platform' => 'ubuntu-15.04-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1504-x86_64'
-          }
-        },
-        'ubuntu1510-32' => {
-          :general => {
-            'platform' => 'ubuntu-15.10-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1510-i386'
-          }
-        },
-        'ubuntu1510-64' => {
-          :general => {
-            'platform' => 'ubuntu-15.10-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1510-x86_64'
-          }
-        },
-        'ubuntu1604-32' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-i386',
-            'packaging_platform' => 'ubuntu-16.04-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1604-i386'
-          }
-        },
-        'ubuntu1604-64' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-amd64',
-            'packaging_platform' => 'ubuntu-16.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1604-x86_64'
-          }
-        },
-        'ubuntu1604-POWER' => {
-          :general => {
-            'platform'           => 'ubuntu-16.04-ppc64el',
-            'packaging_platform' => 'ubuntu-16.04-ppc64el'
-          },
-          :abs => {
-            'template' => 'ubuntu-16.04-power8'
-          }
-        },
-        'ubuntu1610-32' => {
-          :general => {
-            'platform' => 'ubuntu-16.10-i386'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1610-i386'
-          }
-        },
-        'ubuntu1610-64' => {
-          :general => {
-            'platform' => 'ubuntu-16.10-amd64'
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1610-x86_64'
-          }
-        },
-        'ubuntu1804-64' => {
-          :general => {
-            'platform'           => 'ubuntu-18.04-amd64',
-            'packaging_platform' => 'ubuntu-18.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https iproute2 gnupg',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1804-x86_64'
-          }
-        },
-        'ubuntu1810-64' => {
-          :general => {
-            'platform'           => 'ubuntu-18.10-amd64',
-            'packaging_platform' => 'ubuntu-18.10-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https iproute2',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-1810-x86_64'
-          }
-        },
-        'ubuntu2004-64' => {
-          :general => {
-            'platform'           => 'ubuntu-20.04-amd64',
-            'packaging_platform' => 'ubuntu-20.04-amd64'
-          },
-          :docker => {
-            'docker_image_commands' => [
-              'cp /bin/true /sbin/agetty',
-              'apt-get install -y net-tools wget locales apt-transport-https iproute2 gnupg',
-              'locale-gen en_US.UTF-8',
-              'echo LANG=en_US.UTF-8 > /etc/default/locale'
-            ]
-          },
-          :vmpooler => {
-            'template' => 'ubuntu-2004-x86_64'
-          }
-        },
-        'ubuntu2004-AARCH64' => {
-          :general => {
-            'platform'           => 'ubuntu-20.04-aarch64',
-            'packaging_platform' => 'ubuntu-20.04-aarch64'
-          },
-          :abs => {
-            'template' => 'ubuntu-2004-arm64'
-          },
-        },
         'vro6-64' => {
           :general => {
             'platform'           => 'sles-11-x86_64',
@@ -1924,9 +1801,9 @@ module BeakerHostGenerator
     def get_osinfo(bhg_version)
       case bhg_version
       when 0
-        {}.deep_merge!(osinfo)
+        {}.deeper_merge!(osinfo)
       when 1
-        {}.deep_merge!(osinfo).deep_merge!(osinfo_bhgv1)
+        {}.deeper_merge!(osinfo).deeper_merge!(osinfo_bhgv1)
       else
         raise "Invalid beaker-hostgenerator version: #{bhg_version}"
       end
@@ -1970,10 +1847,7 @@ module BeakerHostGenerator
     #         }
     def get_platform_info(bhg_version, platform, hypervisor)
       info = get_osinfo(bhg_version)[platform]
-      result = {}
-      result.deep_merge!(info[:general]) if info[:general]
-      result.deep_merge!(info[hypervisor]) if info[hypervisor]
-      result
+      {}.deeper_merge!(info[:general]).deeper_merge!(info[hypervisor])
     end
 
     # Perform any adjustments or modifications necessary to the given node

data/lib/beaker-hostgenerator/generator.rb

@@ -22,7 +22,7 @@ module BeakerHostGenerator
     def generate(layout, options)
       layout = prepare(layout)
       tokens = tokenize_layout(layout)
-      config = {}.deep_merge(BASE_CONFIG)
+      config = {}.deeper_merge(BASE_CONFIG)
       nodeid = Hash.new(1)
       ostype = nil
       bhg_version = options[:osinfo_version] || 0
@@ -51,7 +51,7 @@ module BeakerHostGenerator
         # Delegate to the hypervisor
         hypervisor = BeakerHostGenerator::Hypervisor.create(node_info, options)
         host_config = hypervisor.generate_node(node_info, host_config, bhg_version)
-        config['CONFIG'].deep_merge!(hypervisor.global_config())
+        config['CONFIG'].deeper_merge!(hypervisor.global_config())
 
         # Merge in any arbitrary key-value host settings. Treat the 'hostname'
         # setting specially, and don't merge it in as an arbitrary setting.
@@ -80,7 +80,7 @@ module BeakerHostGenerator
           decoded = "{#{decoded}}"
         end
         global_config = settings_string_to_map(decoded)
-        config['CONFIG'].deep_merge!(global_config)
+        config['CONFIG'].deeper_merge!(global_config)
       end
 
       # Munge non-string scalar values into proper data types
@@ -117,7 +117,7 @@ module BeakerHostGenerator
 
       if not options[:disable_role_config]
         host_config['roles'].each do |role|
-          host_config.deep_merge! get_role_config(role)
+          host_config.deeper_merge! get_role_config(role)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor
@@ -27,6 +27,22 @@ module BeakerHostGenerator
           base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
         when /^fedora/
           base_config['template'] = base_config['platform']
+        when /^ubuntu/
+          base_template = node_info['ostype'].sub('ubuntu', 'ubuntu-')
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 when 'AARCH64'
+                   'arm64'
+                 when 'POWER'
+                   base_template = node_info['ostype'].sub(/ubuntu(\d\d)/, 'ubuntu-\1.')
+                   'power8'
+                 else
+                   raise "Unknown bits '#{node_info['bits']}' for '#{node_info['ostype']}'"
+                 end
+          base_config['template'] = "#{base_template}-#{arch}"
         end
 
         base_config

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

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor
@@ -10,8 +10,39 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config['docker_cmd'] = ['/sbin/init']
         base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
+        base_config['image'].sub!(/\w+/, 'oraclelinux') if node_info['ostype'] =~ /^oracle/
         base_config['image'].sub!(/(\w+)/, '\1/leap') if node_info['ostype'] =~ /^opensuse/
         base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
+        if node_info['bits'] == '64'
+          base_config['image'] = "amd64/#{base_config['image']}"
+        end
+
+        docker_commands = []
+
+        case node_info['ostype']
+        when /^ubuntu/
+          docker_commands << 'cp /bin/true /sbin/agetty'
+
+          if node_info['ostype'] =~ /1404/
+            docker_commands << 'rm /usr/sbin/policy-rc.d'
+            docker_commands << 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+          end
+
+          extra_packages_to_install = case node_info['ostype']
+                                      when /1404/
+                                        ['apt-transport-https']
+                                      when /1604/
+                                        ['locales']
+                                      else
+                                        ['locales', 'iproute2', 'gnupg']
+                                      end
+
+          docker_commands << "apt-get install -y net-tools wget #{extra_packages_to_install.join(' ')}"
+          docker_commands << 'locale-gen en_US.UTF-8'
+          docker_commands << 'echo LANG=en_US.UTF-8 > /etc/default/locale'
+
+          base_config['docker_image_commands'] = docker_commands
+        end
 
         return base_generate_node(node_info, base_config, bhg_version, :docker)
       end

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

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/hypervisor'
 require 'beaker-hostgenerator/data'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator::Hypervisor
   class Unknown < BeakerHostGenerator::Hypervisor::Interface

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

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor

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

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor
@@ -8,7 +8,7 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       # default global configuration keys
-      def global_config()
+      def global_config
         {
           'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'
         }
@@ -18,10 +18,21 @@ module BeakerHostGenerator
         base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
 
         case node_info['ostype']
-        when /^centos/
-          base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
+        when /^(almalinux|centos|redhat|rocky)/
+          base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
         when /^fedora/
-          base_config['template'] = base_config['platform']
+          base_config['template'] ||= base_config['platform']
+        when /^ubuntu/
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 else
+                   nil
+                 end
+
+          base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
         end
 
         # Some vmpooler/vsphere platforms have special requirements.

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -94,7 +94,7 @@ module BeakerHostGenerator
       def base_generate_node(node_info, base_config, bhg_version, *hypervisors)
         platform = node_info['platform']
         hypervisors.map do |hypervisor|
-          base_config.deep_merge! get_platform_info(bhg_version, platform, hypervisor)
+          base_config.deeper_merge! get_platform_info(bhg_version, platform, hypervisor)
         end
 
         base_config['hypervisor'] = @name

data/lib/beaker-hostgenerator/util.rb

@@ -1,7 +1,7 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/roles'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Utils
@@ -18,8 +18,8 @@ module BeakerHostGenerator
     def dump_hosts(hosts, path)
       vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
       config = {}
-      config.deep_merge! BeakerHostGenerator::Data.BASE_CONFIG
-      config['CONFIG'].deep_merge! vmpooler_hypervisor.global_config()
+      config.deeper_merge! BeakerHostGenerator::Data.BASE_CONFIG
+      config['CONFIG'].deeper_merge! vmpooler_hypervisor.global_config()
 
       hosts.each do |host|
         config['HOSTS'][host.node_name] = {

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.4.0'
+    STRING = '1.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -158,20 +158,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: stringify-hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
 description: |
   The beaker-hostgenerator tool will take a Beaker SUT (System Under Test) spec as
   its first positional argument and use that to generate a Beaker host