beaker-hostgenerator 0.3.3 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTBmNmVmOGQzOGFiZmRjZDliZjJlNmZlYjc5OTljYzY1NmVhZWNhNA==
+    ZTQyMTQzOTYwYjk2NzU5NTdjZGI1NzE0NzFlY2JjZWQ5OTFiZWNjOQ==
   data.tar.gz: !binary |-
-    NjYzYzI1MWQyYjNmMTUyNTIwODUyYTAwMTk1ZDIyMjlmNjdjMWJjYQ==
+    YzIxMWNjZWJmZDQ2ODFhZWI0NTk5YjcxNzUxZTQ5OWMwZTBlMmZiOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDBhMWMwOTRlZGI5NTg1NGJkZDExMzhlZTRiYTcxZjA3OTdmOTdiMWIwYTMw
-    YWZiNzlhMTdhZTY2ZGU0MTJiMmU4YTdiMTI1ZjM3MjEwNTRjZTI0YzM1OTBh
-    YzQ3ZWU3OTgxYmY5ODY0MzIxMjRlMzkxYzBiZjg2NjQ5YzY5OTQ=
+    ZTE3ZTcyZjE0YzM1MGJiMWE2MzJlYTFiOTJmYjRiZjllNDM1MmI1MDI1N2U4
+    ODU5MGQyZmI3YjE0NmQwNzE1NmU4Zjc4NzVmNmM2OWJiN2M2ODBmMDdjMzUw
+    ZTUxMjQyZTMzNTNkYjQ1OWI3MTllZTAyZWQ2ZmYyMWMyNjllNDE=
   data.tar.gz: !binary |-
-    MTUxNGQ5MmVlMTk3NWZhMGFmMDdiYWIzNmZjNzEzN2Y4OThkNjhkZDg1MjZi
-    OWMxM2ZiNjJkMThiZGIzOTM4ZWJkYjdjZDgyMzAxZWNmOThiMDQzZGE3ODRl
-    ZmZjZGU0ZWFiZmU0YjlhMGYyNzk3ODQyYjNiYzMxYmUzMzFlMjA=
+    NmYxZjUyOGEyYjY1OTdiODVjNmNhZTExN2RmNWI3YWI4MzE3N2RjYWI2NDU1
+    MDE1ZDFmMzExMTdlYTZjY2NiN2ZjZDY0NWNjZWQ4MWZhNmM1ODM0NTMyYzU5
+    ODY1NTYyNWE0MGMwZDNiYzQyMTdmZDE1YTI2NDdiNzY3NjYyODE=

data/CHANGELOG.md

@@ -7,6 +7,23 @@ Versioning](http://semver.org).
 ## [Unreleased][unreleased]
 ### Changed
 
+## [0.4.0] - 2016-02-05
+- Add new optional parameters to CLI:
+    --pe_upgrade_dir UPGRADE_PATH
+        Explicitly set pe_upgrade_dir attribute on generated hosts.
+    --pe_upgrade_ver UPGRADE_VERSION
+        Explicitly set pe_upgrade_ver attribute on generated hosts.
+    --pe_dir PATH
+        Explicitly set pe_dir attribute on generated hosts.
+    --pe_ver VERSION
+        Explicitly set pe_ver attribute on generated hosts.
+
+- Implement data-driven testing approach that separates test logic from test
+  data to improve coverage on important code path (BeakerHostGenerator::CLI).
+
+## [0.3.3] - 2016-02-04
+- Fix Cisco platforms by setting required parameters for the vmpooler templates.
+
 ## [0.3.2] - 2016-01-28
 - Change the way we generate the platform string for windows 10 hosts.
 

data/Gemfile

@@ -21,6 +21,10 @@ group :acceptance_testing do
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 2.0')
 end
 
+group :testing do
+  gem "minitest"
+end
+
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 3 Feb, 2016 (34f5cee5)](#LATEST)
+* [LATEST - 10 Feb, 2016 (fe10edc1)](#LATEST)
+* [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)
@@ -9,7 +10,205 @@
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 3 Feb, 2016 (34f5cee5)
+### <a name = "LATEST">LATEST - 10 Feb, 2016 (fe10edc1)
+
+* (GEM) update beaker-hostgenerator version to 0.4.0 (fe10edc1)
+
+* (MAINT) Remove hard-coded gemspec date. (4770b013)
+
+* Merge pull request #23 from puppetlabs/maint (f8b77852)
+
+
+```
+Merge pull request #23 from puppetlabs/maint
+
+(QENG-3466) Fix --list bug and write tests to prevent recurrences.
+```
+* (MAINT) s/Errors/Exceptions/ in bin directory (b8b68c60)
+
+* (MAINT) Better semantics for exception naming. (d0129893)
+
+* (MAINT) Actually add new test. (f80192f3)
+
+* (MAINT) Be more explicit in CHANGELOG (0a39fb6b)
+
+* (MAINT) Write test for safe early exit behavior. (34866de1)
+
+
+```
+(MAINT) Write test for safe early exit behavior.
+
+Specifically, ensure that when passed the "--list" options,
+BeakerHostGenerator::CLI.initialize will raise the
+BeakerHostGenerator::Errors::SafeEarlyExit exception which is intended to be
+ignored by the script calling BeakerHostGenerator::CLI.initialize
+```
+* (MAINT) Update CHANGELOG (bb52432b)
+
+* (MAINT) Write tests to protect --list CLI behavior. (e523773f)
+
+* (MAINT) Don't call 'exit' in BeakerHostGenerator::CLI class. (e3bac654)
+
+* (MAINT) Fix bug introduced by eecc04c (865b04c2)
+
+* Merge pull request #21 from puppetlabs/qeng-3370 (45bf2295)
+
+
+```
+Merge pull request #21 from puppetlabs/qeng-3370
+
+(QENG-3370) Add pe_* value CLI override options.
+```
+* (QENG-3370) Use mixins instead of module method references. (eecc04c8)
+
+* (QENG-3370) Address PR feedback. (19cc3a9b)
+
+* (QENG-3370) Fix grammar no no. (4d7d5db3)
+
+* Revert "(QENG-3370) Add .projectile (emacs plugin) path exclusion." (1db7dfcc)
+
+
+```
+Revert "(QENG-3370) Add .projectile (emacs plugin) path exclusion."
+
+This reverts commit 3dd4eb3a5488b55f6aae1d65db43e84c7c0ff625.
+```
+* (QENG-3370) Fix fixtures after merging cisco changes from master branch. (e1c65ffc)
+
+* Merge remote-tracking branch 'origin/master' into qeng-3370 (8559505b)
+
+* (QENG-3370) Fix module constant initialization bug. (aa3e08cd)
+
+
+```
+(QENG-3370) Fix module constant initialization bug.
+
+Similar to the BeakerHostGenerator::Data::Vmpooler data initialization bug, this
+is something that would not typically show up during normal command line usage
+of beaker-hostgenerator because at that time there is typically only one
+reference made to the BeakerHostGenerator::Utils module constant. However during
+test fixture generation and rspec tests the modules were only loaded once so
+there was only one attempt to read in environment variables which led to
+inconsisten results depending on the order in which the fixtures were
+generated/tested.
+```
+* (QENG-3370) Fix major bug in BeakerHostGenerator::Data::Vmpooler (f3359c8f)
+
+
+```
+(QENG-3370) Fix major bug in BeakerHostGenerator::Data::Vmpooler
+
+Since the OSINFO and OSINFO_BHGv1 module constants are only initialized once
+(during library load), do not refer directly to them using reference variables.
+Instead, initialize the osinfo variable directly on each call of get_osinfo and
+merge in the module constants as appropriate based on the given
+beaker-hostenerator version integer.
+
+This bug never came up during normal command-line usage of beaker-hostgenerator
+because get_osinfo would never be expected to be called with both bhg_version=0
+and bhg_version=1. However, it came up both during generation of test fixtures
+and validation of those test fixtures in rspec since the module is only loaded
+once which led to the mutated value of the OSINFO module constant to persist
+across all initializations of the BeakerHostGenerator::CLI class.
+```
+* (QENG-3370) Generate test cases for pe_{family,version} variable combinations. (99965b3f)
+
+* (QENG-3370) Minor cleanup of new rspec test. (e9a77bb5)
+
+* (QENG-3370) Use fixtures in rspec tests instead of minitest. (b401574d)
+
+
+```
+(QENG-3370) Use fixtures in rspec tests instead of minitest.
+
+This makes it possible to treat each individual fixture its own test case which
+improves the reporting and ensures that all fixtures are tested even if some
+fail.
+
+Using a loop containing an assertion in minitest did not work for this purpose
+because a failed assertion caused the loop to break prematurely; it probably
+would have been possible to catch whatever the exception was and continue the
+loop but whatever. I already did this.
+```
+* (QENG-3370) Rename options_string to arguments_string. (c6507fd4)
+
+* (QENG-3370) Add documentation for test fixtures. (b6712a9b)
+
+* (QENG-3370) Make it a little easier to generate fixtures. (a829a425)
+
+
+```
+(QENG-3370) Make it a little easier to generate fixtures.
+
+* Move FixtureGenerator class into test/utils/generator_helpers.rb
+* Create generate:test Rake task
+```
+* (QENG-3370) Add assert_equal mismatch message. (11cbba23)
+
+* (QENG-3370) Add .projectile (emacs plugin) path exclusion. (3dd4eb3a)
+
+* (QENG-3370) Use YAML.load_file method. (0b353986)
+
+* (QENG-3370) Don't use minitest to generate fixtures. (6c3a890f)
+
+* (QENG-3370) Generate various option fixtures. (71e4efca)
+
+* (QENG-3370) Add some fixtures and a test case to iterate over them. (722abcd5)
+
+* (QENG-3370) Use enumerators to produce more diverse combinations of host roles. (2f913aec)
+
+* (QENG-3370) Move helper methods into helper module. (f4fd1cf5)
+
+
+```
+(QENG-3370) Move helper methods into helper module.
+
+Unclutters the fixture generator class and maintains distinction between test
+and helper methods.
+```
+* (QENG-3370) Create common method for generating options-based fixtures. (6be93ddc)
+
+
+```
+(QENG-3370) Create common method for generating options-based fixtures.
+
+This will make it easier to generate many many fixtures.
+```
+* (QENG-3370) Add janky fixture generator. (88ac0341)
+
+
+```
+(QENG-3370) Add janky fixture generator.
+
+This script allows one to generate test fixtures using beaker-hostgenerator
+itself. Yay. The generated directory structure could use some more thought.
+```
+* (QENG-3370) Move GeneratorTestHelpers into its own file. (f7d3f996)
+
+* (QENG-3370) Use BeakerHostGenerator::CLI directly. (45a2f7e4)
+
+
+```
+(QENG-3370) Use BeakerHostGenerator::CLI directly.
+
+This may be necessary to ensure coverage checks can work correctly. Also, it
+makes sense to test at this since I know of at least one project that is doing
+something similar.
+
+Not so sure about the way this is handling stderr though--just trying to avoid
+polluting the minitest console output.
+```
+* (QENG-3770) Add GeneratorTestHelpers and default options test for test class. (388867d1)
+
+* (QENG-3770) Stub out minitest for Generator class. (3af5796d)
+
+* (QENG-3770) Get test:spec rake task to run minitest also. (436bb778)
+
+* (QENG-3370) Add pe_* value CLI override options. (e321afc3)
+
+### <a name = "0.3.3">0.3.3 - 3 Feb, 2016 (41051da9)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.3.3 (41051da9)
 
 * (GEM) update beaker-hostgenerator version to 0.3.3 (34f5cee5)
 

data/README.md

@@ -8,6 +8,21 @@ but is designed in a way that makes it possible to easily add support for
 additional hypervisor templates (any hypervisor type supported by
 [beaker][beaker]).
 
+<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-generate-toc again -->
+**Table of Contents**
+
+- [Beaker Host Generator](#beaker-host-generator)
+    - [Usage](#usage)
+        - [Simple two-host SUT layout](#simple-two-host-sut-layout)
+        - [Single-host SUT layout with Arbitrary Roles](#single-host-sut-layout-with-arbitrary-roles)
+    - [Testing](#testing)
+        - [Test Fixtures](#test-fixtures)
+            - [Generated Fixtures](#generated-fixtures)
+    - [Support](#support)
+    - [License](#license)
+
+<!-- markdown-toc end -->
+ 
 ## Usage
 
 Below are some example usages of `beaker-hostgenerator`.
@@ -86,6 +101,82 @@ CONFIG:
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
 ```
 
+## Testing
+
+Beaker Host Generator currently uses both rspec and minitest tests. To run both
+at the same time, run:
+```bash
+bundle exec rake tests
+```
+
+### Test Fixtures
+
+Beaker Host Generator makes extensive use of test fixtures to validate its
+behavior under specific conditions. An example of such a test fixture is as
+follows:
+
+```yaml
+---
+arguments_string: "--pe_dir /opt/hello centos6-64mdc"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    centos6-64-1:
+      pe_dir: "/opt/hello"
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: centos-6-x86_64
+      template: centos-6-x86_64
+      roles:
+      - agent
+      - master
+      - database
+      - dashboard
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
+```
+
+These test fixtures are yaml files searched for in the directory
+`test/fixtures`. The data structure expected in these files is a hash with four
+keys:
+
+- `arguments_string`: The command line arguments that should be passed to
+  `beaker-hostgenerator`
+- `environment_variables`: The environment variables that should be set during
+  the `beaker-hostgenerator` call.
+- `expected_hash`: A hash that should match the output of `beaker-hostgenerator`
+  when it is run with `options\_string`
+- `expected_exception`: If the `arguments_string` passed to `beaker-hostgenerator`
+  is expected to lead to an exceptional state, this is the name of the exception
+  that the fixture test will attempt to match.
+
+#### Generated Fixtures
+
+It is possible to generate test fixtures using the current state of the
+`beaker-hostgenerator` library. To do this, call the `generate:fixtures` Rake
+task.
+
+However, this is not something that should need to be done very often. If you
+are running tests and find that some fixtures no longer work, you have most
+likely made a change that incompatibly changes the behavior of
+`beaker-hostgenerator` for other users. Use the test fixtures as a guide to
+figure out what you did wrong and figure out how to achieve your goal without
+potentially breaking `beaker-hostgenerator` for other users.
+
+There are a few circumstances when you should expect to run the
+`generate:fixtures` task:
+
+- When you modify the `FixtureGenerator` to generate new fixtures.
+- When you need to fix a bug (generated hosts are not usable without your
+  change, for example).
+- When preparing for a major version bump of Beaker Host Generator.
+
+
 ## Support
 
 Support offered by [Puppet Labs](https://puppetlabs.com) may not always be timely

data/Rakefile

@@ -1,13 +1,24 @@
 require 'rspec/core/rake_task'
+require 'rake/testtask'
 
 namespace :test do
 
   namespace :spec do
 
+    task :minitest do
+      desc "Run minitest tests"
+      Rake::TestTask.new do |task|
+        task.libs << %w(test lib)
+        task.test_files = FileList['test/test*.rb']
+        task.verbose = true
+      end
+    end
+
     desc "Run spec tests"
     RSpec::Core::RakeTask.new(:run) do |t|
       t.rspec_opts = ['--color']
       t.pattern = 'spec/'
+      t.ruby_opts = '-Itest'
     end
 
     desc "Run spec tests with coverage"
@@ -37,10 +48,25 @@ A quick acceptance test, named because it has no pre-suites to run
 
 end
 
+namespace :generate do
+  desc "Generate test fixtures."
+  task :fixtures do
+    $LOAD_PATH.unshift(
+      File.join(Dir.pwd, 'lib'),
+      File.join(Dir.pwd, 'test')
+    )
+    require 'beaker-hostgenerator'
+    require 'util/generator_helpers'
+
+    fixgen = FixtureGenerator.new
+    fixgen.generate
+  end
+end
+
 # namespace-named default tasks.
 # these are the default tasks invoked when only the namespace is referenced.
 # they're needed because `task :default` in those blocks doesn't work as expected.
-task 'test:spec' => 'test:spec:run'
+task 'test:spec' => ['test:spec:run', 'test:spec:minitest']
 task 'test:acceptance' => 'test:acceptance:quick'
 
 # global defaults

data/beaker-hostgenerator.gemspec

@@ -5,7 +5,6 @@ require 'beaker-hostgenerator/version'
 Gem::Specification.new do |s|
   s.name        = "beaker-hostgenerator"
   s.version     = BeakerHostGenerator::Version::STRING
-  s.date        = "2015-10-07"
   s.authors     = ["Branan Purvine-Riley", "Wayne Warren"]
   s.email       = ["qe-team@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-hostgenerator"

data/bin/beaker-hostgenerator

@@ -5,4 +5,8 @@ $LOAD_PATH.unshift(lib_dir)
 
 require 'beaker-hostgenerator'
 
-BeakerHostGenerator::CLI.new.execute!
+begin
+  cli = BeakerHostGenerator::CLI.new
+  cli.execute!
+rescue BeakerHostGenerator::Exceptions::SafeEarlyExit
+end

data/bin/genconfig2

@@ -7,4 +7,8 @@ require 'beaker-hostgenerator'
 
 STDERR.puts("Warning: 'genconfig2' is deprecated and will be removed in beaker-hostgenerator 1.x\n\n")
 
-BeakerHostGenerator::CLI.new.execute!
+begin
+  cli = BeakerHostGenerator::CLI.new
+  cli.execute!
+rescue BeakerHostGenerator::Exceptions::SafeEarlyExit
+end

data/lib/beaker-hostgenerator/cli.rb

@@ -64,6 +64,26 @@ Usage: beaker-hostgenerator [options] <layout>
           @options[:hypervisor] = h
         end
 
+        opts.on('--pe_upgrade_dir UPGRADE_PATH',
+                'Explicitly set pe_upgrade_dir attribute on generated hosts. ') do |p|
+          @options[:pe_upgrade_dir] = p
+        end
+
+        opts.on('--pe_upgrade_ver UPGRADE_VERSION',
+                'Explicitly set pe_upgrade_ver attribute on generated hosts. ') do |p|
+          @options[:pe_upgrade_ver] = p
+        end
+
+        opts.on('--pe_dir PATH',
+                'Explicitly set pe_dir attribute on generated hosts. ') do |p|
+          @options[:pe_dir] = p
+        end
+
+        opts.on('--pe_ver VERSION',
+                'Explicitly set pe_ver attribute on generated hosts. ') do |p|
+          @options[:pe_ver] = p
+        end
+
         opts.on('--disable-role-config',
                 "Do not include role-specific configuration.") do
           @options[:disable_role_config] = true
@@ -98,14 +118,13 @@ Usage: beaker-hostgenerator [options] <layout>
 
       if @options[:list_platforms_and_roles]
         print_platforms_and_roles
-        exit
-      end
+        raise BeakerHostGenerator::Exceptions::SafeEarlyExit
+      else
+        # Tokenizing the config definition for great justice
+        @tokens = argv[0].split('-')
 
-      # Tokenizing the config definition for great justice
-      @tokens = argv[0].split('-')
-
-      if @options[:osinfo_version] === 0
-        warning = <<-eow
+        if @options[:osinfo_version] === 0
+          warning = <<-eow
 WARNING: Starting with beaker-hostgenerator 1.x platform strings for "el" hosts
 will correspond to the actual linux distribution name. ie, the platform string
 corresponding to a host specified as "centos4_64a" will be "centos-4-x86_64"
@@ -113,7 +132,8 @@ rather than "el-4-x86_64". It is recommended that you update your project's test
 suites ASAP or be forced to do so when beaker-hostgenerator development moves on
 to the 1.x series. We don't intend to backport features or platforms to 0.x.
 eow
-        STDERR.puts(warning)
+          STDERR.puts(warning)
+        end
       end
     end
 

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

@@ -441,11 +441,12 @@ module BeakerHostGenerator
       }
 
       def get_osinfo(bhg_version=0)
+        osinfo = {}
         case bhg_version
         when 0
-          osinfo = OSINFO
+          osinfo.deep_merge! OSINFO
         when 1
-          osinfo = OSINFO
+          osinfo.deep_merge! OSINFO
           osinfo.deep_merge! OSINFO_BHGv1
         else
           raise "Invalid beaker-hostgenerator version: #{bhg_version}"

data/lib/beaker-hostgenerator/data.rb

@@ -1,11 +1,21 @@
 module BeakerHostGenerator
   module Data
 
-    # Pull various informations out of the environment.
-    PE_VERSION=ENV['pe_version']
-    PE_FAMILY=ENV['pe_family']
-    PE_UPGRADE_VERSION=ENV['pe_upgrade_version']
-    PE_UPGRADE_FAMILY=ENV['pe_upgrade_family']
+    def pe_version
+      ENV['pe_version']
+    end
+
+    def pe_family
+      ENV['pe_family']
+    end
+
+    def pe_upgrade_version
+      ENV['pe_upgrade_version']
+    end
+
+    def pe_upgrade_family
+      ENV['pe_upgrade_family']
+    end
 
     PE_USE_WIN32=ENV['pe_use_win32']
 

data/lib/beaker-hostgenerator/exceptions.rb

@@ -0,0 +1,7 @@
+module BeakerHostGenerator
+  module Exceptions
+    class Error < RuntimeError ; end
+    class InvalidNodeSpecError < BeakerHostGenerator::Exceptions::Error ; end
+    class SafeEarlyExit < SystemExit ; end
+  end
+end

data/lib/beaker-hostgenerator/generator.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/util'
 require 'beaker-hostgenerator/data'
-require 'beaker-hostgenerator/error'
+require 'beaker-hostgenerator/exceptions'
 require 'beaker-hostgenerator/roles'
 
 require 'yaml'
@@ -8,15 +8,9 @@ require 'yaml'
 module BeakerHostGenerator
   class Generator
     include BeakerHostGenerator::Data
-    include BeakerHostGenerator::Errors
+    include BeakerHostGenerator::Exceptions
     include BeakerHostGenerator::Utils
 
-    BASE_HOST_CONFIG = {
-      'pe_dir' => BeakerHostGenerator::Utils.pe_dir(PE_VERSION, PE_FAMILY),
-      'pe_ver' => PE_VERSION,
-      'pe_upgrade_dir' => BeakerHostGenerator::Utils.pe_dir(PE_UPGRADE_VERSION, PE_UPGRADE_FAMILY),
-      'pe_upgrade_ver' => PE_UPGRADE_VERSION,
-    }
     attr_reader :options
 
     def initialize options
@@ -56,8 +50,21 @@ module BeakerHostGenerator
         node_info['ostype'] = ostype
         node_info['nodeid'] = nodeid[ostype]
 
+        config = {
+          'pe_dir' => pe_dir(pe_version, pe_family),
+          'pe_ver' => pe_version,
+          'pe_upgrade_dir' => pe_dir(pe_upgrade_version, pe_upgrade_family),
+          'pe_upgrade_ver' => pe_upgrade_version,
+        }
+
+        [:pe_dir, :pe_ver, :pe_upgrade_dir, :pe_upgrade_ver].each do |option|
+          if @options[option]
+            config[option.to_s] = @options[option]
+          end
+        end
+
         host_name, host_config = generate_node(
-          node_info, BASE_HOST_CONFIG, bhg_version=@options[:osinfo_version])
+          node_info, config, bhg_version=@options[:osinfo_version])
 
         if PE_USE_WIN32 && ostype =~ /windows/ && node_info['bits'] == "64"
           host_config['ruby_arch'] = 'x86'

data/lib/beaker-hostgenerator/util.rb

@@ -22,7 +22,7 @@ module BeakerHostGenerator
 
     def fixup_node(cfg)
       # PE 2.8 doesn't exist for EL 4. We use 2.0 instead.
-      if cfg['platform'] =~ /el-4/ and PE_VERSION =~ /2\.8/
+      if cfg['platform'] =~ /el-4/ and pe_version =~ /2\.8/
         cfg['pe_ver'] = "2.0.3"
       end
     end
@@ -59,6 +59,6 @@ module BeakerHostGenerator
       return BeakerHostGenerator::Data::ROLES
     end
 
-    module_function :dump_hosts, :get_platforms, :get_roles, :pe_dir
+    module_function :get_roles, :get_platforms, :dump_hosts, :fixup_node, :pe_dir
   end
 end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.3.3'
+    STRING = '0.4.0'
   end
 end