beaker-hostgenerator 1.2.10 → 1.6.0

data/CODEOWNERS

@@ -1 +0,0 @@
-* @puppetlabs/beaker

data/Gemfile

@@ -1,7 +1,11 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
+
+group :release do
+  gem 'github_changelog_generator', :require => false
+end

data/HISTORY.md

@@ -1,29 +1,56 @@
-# worker - History
-## Tags
-* [LATEST - 7 Jun, 2017 (06b6a0da)](#LATEST)
-* [0.8.4 - 6 Apr, 2017 (77943fb2)](#0.8.4)
-* [0.8.3 - 7 Feb, 2017 (79e8d717)](#0.8.3)
-* [0.8.2 - 3 Jan, 2017 (a61487bf)](#0.8.2)
-* [0.8.1 - 21 Dec, 2016 (2648029d)](#0.8.1)
-* [0.8.0 - 4 Oct, 2016 (2e6dc11e)](#0.8.0)
-* [0.7.4 - 26 Sep, 2016 (1e102ccd)](#0.7.4)
-* [0.7.3 - 11 Aug, 2016 (87c75523)](#0.7.3)
-* [0.7.2 - 13 Jul, 2016 (cee53bcc)](#0.7.2)
-* [0.7.1 - 29 Jun, 2016 (be332325)](#0.7.1)
-* [0.7.0 - 13 Jun, 2016 (f0aafe8d)](#0.7.0)
-* [0.6.0 - 11 May, 2016 (c807eb0d)](#0.6.0)
-* [0.5.0 - 31 Mar, 2016 (fa3ae0c8)](#0.5.0)
-* [0.4.0 - 10 Feb, 2016 (dc333b1c)](#0.4.0)
-* [0.3.3 - 3 Feb, 2016 (41051da9)](#0.3.3)
-* [0.3.2 - 28 Jan, 2016 (299df8ec)](#0.3.2)
-* [0.3.1 - 30 Dec, 2015 (7a3f10ca)](#0.3.1)
-* [0.3.0 - 30 Dec, 2015 (4b03eaf4)](#0.3.0)
-* [0.2.0 - 22 Dec, 2015 (dfa33e5f)](#0.2.0)
-* [0.1.0 - 21 Dec, 2015 (474f4ccb)](#0.1.0)
-* [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
-
+## [1.1.26](https://github.com/voxpupuli/modulesync/tree/1.1.26) (2019-02-19)
+- Add platform
+  - debian10-64
+  - debian10-32
+- Change amazon7-ARM64 to use el-7-aarch64 platform
+
+## [1.1.25] - 2019-01-07
+- Fix --hypervisor vagrant_libvirt
+
+## [1.1.24] - 2019-01-03
+- Add platform:
+  - amazon7-ARM64
+
+## [1.1.23] - 2018-12-13
+- Add platforms:
+  - redhat8-64
+  - osx1014-64
+
+## [1.1.22] - 2018-11-21
+- Add vagrant hypervisor for debian plaforms
+
+## [1.1.21] - 2018-11-19
+- Disable getty when using docker
+
+## [1.1.20] - 2018-11-14
+- Add gnupg to docker_image_commands for debian9-64
+- Add platform:
+  - fedora29-64
+
+## [1.1.19] - 2018-10-18
+- Add platforms:
+  - solaris114-32
+  - solaris114-64
+
+## [1.1.18] - 2018-10-10
+- Add platform:
+  - ubuntu1810-64
+
+## [1.1.17] - 2018-10-05
+- Add platforms:
+  - windows2019_core-64
+  - windows2019_core-6432
+
+## [1.1.16] - 2018-09-04
+- Install iproute2 on ubuntu18.04 for containers
+
+## [1.1.15] - 2018-08-16
+- Add platforms:
+  - panos61-64
+  - panos71-64
 ## Details
-### <a name = "LATEST">LATEST - 7 Jun, 2017 (06b6a0da)
+
+### 0.9.0 - 7 Jun, 2017 (06b6a0da)
 
 * (GEM) update beaker-hostgenerator version to 0.9.0 (06b6a0da)
 
@@ -1747,6 +1774,6 @@ This commit updates the code to use the new constant name.
 
 * README typo fixed (ba88e07e)
 
-### <a name = "0.0.1">0.0.1 - 7 Oct, 2015 (d99251e6)
+### 0.0.1 - 7 Oct, 2015 (d99251e6)
 
 * Initial release.

data/README.md

@@ -453,6 +453,20 @@ contribute.
 If you have questions or comments, please contact the Beaker team at the
 `#puppet-dev` IRC channel on chat.freenode.org
 
+## Make a new release
+
+To make a new release:
+
+* Switch to a new git branch
+* Update `lib/beaker-hostgenerator/version.rb` to the new version
+* export `CHANGELOG_GITHUB_TOKEN` with a GitHub access token
+* run `bundle exec rake changelog`
+* Review the CHANGELOG.md
+* Create a PR
+* Get it reviewed and merged
+* Create a signed git tag with the same version number and push it
+* GitHub actions will do the release
+
 ## License
 
 `beaker-hostgenerator` is distributed under the

data/Rakefile

@@ -55,3 +55,27 @@ task 'test:spec' => ['test:spec:run', 'test:spec:minitest']
 # global defaults
 task :test => 'test:spec'
 task :default => :test
+
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix modulesync skip-changelog]
+    config.user = 'voxpupuli'
+    config.project = 'beaker-hostgenerator'
+    config.future_release = Gem::Specification.load("#{config.project}.gemspec").version
+  end
+
+  # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
+  require 'rbconfig'
+  if RbConfig::CONFIG['host_os'] =~ /linux/
+    task :changelog do
+      puts 'Fixing line endings...'
+      changelog_file = File.join(__dir__, 'CHANGELOG.md')
+      changelog_txt = File.read(changelog_file)
+      new_contents = changelog_txt.gsub(/\r\n/, "\n")
+      File.open(changelog_file, 'w') { |file| file.puts new_contents }
+    end
+  end
+rescue LoadError
+end

data/beaker-hostgenerator.gemspec

@@ -23,8 +23,8 @@ eos
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 

data/lib/beaker-hostgenerator/data.rb

@@ -80,7 +80,76 @@ module BeakerHostGenerator
     # Hypervisor implementations will then grab specific bits of data out of
     # this hash and combine them to produce the generated hosts output.
     def osinfo
-      {
+      result = {}
+
+      # Fedora
+      (19..34).each do |release|
+        # 32 bit support was dropped in Fedora 31
+        if release < 31
+          result["fedora#{release}-32"] = {
+            :general => {
+              'platform' => "fedora-#{release}-i386"
+            }
+          }
+        end
+
+        result["fedora#{release}-64"] = {
+          :general => {
+            'platform' => "fedora-#{release}-x86_64"
+          }
+        }
+      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 => {
             'platform'           => 'aix-5.3-power',
@@ -156,26 +225,17 @@ module BeakerHostGenerator
         'centos4-32' => {
           :general => {
             'platform' => 'el-4-i386'
-          },
-          :vmpooler => {
-            'template' => 'centos-4-i386'
           }
         },
         'centos4-64' => {
           :general => {
             'platform' => 'el-4-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'centos-4-x86_64'
           }
         },
         'centos5-32' => {
           :general => {
             'platform'           => 'el-5-i386',
             'packaging_platform' => 'el-5-i386'
-          },
-          :vmpooler => {
-            'template' => 'centos-5-i386'
           }
         },
         'centos5-64' => {
@@ -189,18 +249,12 @@ module BeakerHostGenerator
               'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
               'sed -i -e "/mingetty/d" /etc/inittab'
             ]
-          },
-          :vmpooler => {
-            'template' => 'centos-5-x86_64'
           }
         },
         'centos6-32' => {
           :general => {
             'platform'           => 'el-6-i386',
             'packaging_platform' => 'el-6-i386'
-          },
-          :vmpooler => {
-            'template' => 'centos-6-i386'
           }
         },
         'centos6-64' => {
@@ -215,9 +269,6 @@ module BeakerHostGenerator
               'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
               'rm /etc/init/tty.conf'
             ]
-          },
-          :vmpooler => {
-            'template' => 'centos-6-x86_64'
           }
         },
         'centos7-64' => {
@@ -230,9 +281,6 @@ module BeakerHostGenerator
               'cp /bin/true /sbin/agetty',
               'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss'
             ]
-          },
-          :vmpooler => {
-            'template' => 'centos-7-x86_64'
           }
         },
         'centos8-64' => {
@@ -245,9 +293,6 @@ module BeakerHostGenerator
               'cp /bin/true /sbin/agetty',
               'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
             ]
-          },
-          :vmpooler => {
-            'template' => 'centos-8-x86_64'
           }
         },
         # Deprecated
@@ -591,239 +636,132 @@ module BeakerHostGenerator
             'template' => 'debian-10-i386'
           }
         },
-        'fedora14-32' => {
-          :general => {
-            'platform' => 'fedora-14-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-14-i386'
-          }
-        },
-        'fedora19-32' => {
+        'debian11-64' => {
           :general => {
-            'platform' => 'fedora-19-i386'
+            'platform'           => 'debian-11-amd64',
+            'packaging_platform' => 'debian-11-amd64'
           },
-          :vmpooler => {
-            'template' => 'fedora-19-i386'
-          }
-        },
-        'fedora19-64' => {
-          :general => {
-            'platform' => 'fedora-19-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'fedora-19-x86_64'
-          }
-        },
-        'fedora20-32' => {
-          :general => {
-            'platform' => 'fedora-20-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-20-i386'
-          }
-        },
-        'fedora20-64' => {
-          :general => {
-            'platform' => 'fedora-20-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'fedora-20-x86_64'
-          }
-        },
-        'fedora21-32' => {
-          :general => {
-            'platform' => 'fedora-21-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-21-i386'
-          }
-        },
-        'fedora21-64' => {
-          :general => {
-            'platform' => 'fedora-21-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'fedora-21-x86_64'
-          }
-        },
-        'fedora22-32' => {
-          :general => {
-            'platform' => 'fedora-22-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-22-i386'
-          }
-        },
-        'fedora22-64' => {
-          :general => {
-            'platform' => 'fedora-22-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'fedora-22-x86_64'
-          }
-        },
-        'fedora23-32' => {
-          :general => {
-            'platform' => 'fedora-23-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-23-i386'
-          }
-        },
-        'fedora23-64' => {
-          :general => {
-            'platform' => 'fedora-23-x86_64'
-          },
-          :vmpooler => {
-            'template' => 'fedora-23-x86_64'
-          }
-        },
-        'fedora24-32' => {
-          :general => {
-            'platform'           => 'fedora-24-i386',
-            'packaging_platform' => 'fedora-24-i386'
+          :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'
+            ]
           },
-          :vmpooler => {
-            'template' => 'fedora-24-i386'
-          }
-        },
-        'fedora24-64' => {
-          :general => {
-            'platform'           => 'fedora-24-x86_64',
-            'packaging_platform' => 'fedora-24-x86_64'
+          :vagrant => {
+            'box' => 'debian/bullseye64',
           },
           :vmpooler => {
-            'template' => 'fedora-24-x86_64'
+            'template' => 'debian-11-x86_64'
           }
         },
-        'fedora25-32' => {
+        'fedora14-32' => {
           :general => {
-            'platform'           => 'fedora-25-i386',
-            'packaging_platform' => 'fedora-25-i386'
-          },
-          :vmpooler => {
-            'template' => 'fedora-25-i386'
+            'platform' => 'fedora-14-i386'
           }
         },
-        'fedora25-64' => {
+        'huaweios6-POWER' => {
           :general => {
-            'platform'           => 'fedora-25-x86_64',
-            'packaging_platform' => 'fedora-25-x86_64'
+            'platform' => 'huaweios-6-powerpc'
           },
-          :vmpooler => {
-            'template' => 'fedora-25-x86_64'
+          :abs => {
+            'template' => 'huaweios-6-powerpc'
           }
         },
-        'fedora26-64' => {
+        'panos61-64' => {
           :general => {
-            'platform'           => 'fedora-26-x86_64',
-            'packaging_platform' => 'fedora-26-x86_64'
+            'platform' => 'palo-alto-6.1.0-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-26-x86_64'
+            'template' => 'palo-alto-6.1.0-x86_64'
           }
         },
-        'fedora27-64' => {
+        'panos71-64' => {
           :general => {
-            'platform'           => 'fedora-27-x86_64',
-            'packaging_platform' => 'fedora-27-x86_64'
+            'platform' => 'palo-alto-7.1.0-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-27-x86_64'
+            'template' => 'palo-alto-7.1.0-x86_64'
           }
         },
-        'fedora28-64' => {
+        'panos81-64' => {
           :general => {
-            'platform'           => 'fedora-28-x86_64',
-            'packaging_platform' => 'fedora-28-x86_64'
+            'platform' => 'palo-alto-8.1.0-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-28-x86_64'
+            'template' => 'palo-alto-8.1.0-x86_64'
           }
         },
-        'fedora29-64' => {
+        'opensuse11-32' => {
           :general => {
-            'platform'           => 'fedora-29-x86_64',
-            'packaging_platform' => 'fedora-29-x86_64'
+            'platform' => 'opensuse-11-i386'
           },
           :vmpooler => {
-            'template' => 'fedora-29-x86_64'
+            'template' => 'opensuse-11-i386'
           }
         },
-        'fedora30-64' => {
+        'opensuse11-64' => {
           :general => {
-            'platform'           => 'fedora-30-x86_64',
-            'packaging_platform' => 'fedora-30-x86_64'
+            'platform' => 'opensuse-11-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-30-x86_64'
+            'template' => 'opensuse-11-x86_64'
           }
         },
-        'fedora31-64' => {
+        'opensuse15-32' => {
           :general => {
-            'platform'           => 'fedora-31-x86_64',
-            'packaging_platform' => 'fedora-31-x86_64'
+            'platform' => 'opensuse-15-i386'
           },
-          :vmpooler => {
-            'template' => 'fedora-31-x86_64'
-          }
-        },
-        'fedora32-64' => {
-          :general => {
-            'platform'           => 'fedora-32-x86_64',
-            'packaging_platform' => 'fedora-32-x86_64'
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'zypper install -y cron iproute2 tar wget which'
+            ]
           },
           :vmpooler => {
-            'template' => 'fedora-32-x86_64'
+            'template' => 'opensuse-15-i386'
           }
         },
-        'huaweios6-POWER' => {
+        'opensuse15-64' => {
           :general => {
-            'platform' => 'huaweios-6-powerpc'
+            'platform' => 'opensuse-15-x86_64'
           },
-          :abs => {
-            'template' => 'huaweios-6-powerpc'
-          }
-        },
-        'panos61-64' => {
-          :general => {
-            'platform' => 'palo-alto-6.1.0-x86_64'
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'zypper install -y cron iproute2 tar wget which'
+            ]
           },
           :vmpooler => {
-            'template' => 'palo-alto-6.1.0-x86_64'
+            'template' => 'opensuse-15-x86_64'
           }
         },
-        'panos71-64' => {
+        'opensuse42-32' => {
           :general => {
-            'platform' => 'palo-alto-7.1.0-x86_64'
+            'platform' => 'opensuse-42-i386'
           },
-          :vmpooler => {
-            'template' => 'palo-alto-7.1.0-x86_64'
-          }
-        },
-        'panos81-64' => {
-          :general => {
-            'platform' => 'palo-alto-8.1.0-x86_64'
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'zypper install -y cron iproute2 tar wget which'
+            ]
           },
           :vmpooler => {
-            'template' => 'palo-alto-8.1.0-x86_64'
+            'template' => 'opensuse-42-i386'
           }
         },
-        'opensuse11-32' => {
+        'opensuse42-64' => {
           :general => {
-            'platform' => 'opensuse-11-i386'
+            'platform' => 'opensuse-42-x86_64'
           },
-          :vmpooler => {
-            'template' => 'opensuse-11-i386'
-          }
-        },
-        'opensuse11-64' => {
-          :general => {
-            'platform' => 'opensuse-11-x86_64'
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'zypper install -y cron iproute2 tar wget which'
+            ]
           },
           :vmpooler => {
-            'template' => 'opensuse-11-x86_64'
+            'template' => 'opensuse-42-x86_64'
           }
         },
         'oracle5-32' => {
@@ -933,6 +871,15 @@ module BeakerHostGenerator
             'template' => 'osx-1015-x86_64'
           }
         },
+        'osx11-64' => {
+          :general => {
+            'platform'           => 'osx-11-x86_64',
+            'packaging_platform' => 'osx-11-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'macos-112-x86_64'
+          }
+        },
         'redhat4-32' => {
           :general => {
             'platform' => 'el-4-i386'
@@ -1057,6 +1004,15 @@ module BeakerHostGenerator
             'template' => 'redhat-8-x86_64'
           }
         },
+        'redhat8-POWER' => {
+          :general => {
+            'platform'           => 'el-8-ppc64le',
+            'packaging_platform' => 'el-8-ppc64le'
+          },
+          :abs => {
+            'template' => 'redhat-8-power8'
+          }
+        },
         'scientific5-32' => {
           :general => {
             'platform'           => 'el-5-i386',
@@ -1265,216 +1221,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',
@@ -1946,7 +1692,9 @@ module BeakerHostGenerator
             'template' => 'win-10-1809-x86_64'
           }
         }
-      }
+      })
+
+      result
     end
 
     def osinfo_bhgv1
@@ -2022,9 +1770,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
@@ -2068,7 +1816,7 @@ module BeakerHostGenerator
     #         }
     def get_platform_info(bhg_version, platform, hypervisor)
       info = get_osinfo(bhg_version)[platform]
-      {}.deep_merge!(info[:general]).deep_merge!(info[hypervisor])
+      {}.deeper_merge!(info[:general]).deeper_merge!(info[hypervisor])
     end
 
     # Perform any adjustments or modifications necessary to the given node