Please review pull request #215: Add modules to Host Configuration Summary opened by (jeffmccune)

Description:

Without this patch the set of modules installed into the puppet master
modulepath is not displayed in the Host Configuration Summary. This is
a problem because I sometimes forget to switch the branch I'm working on
and I end up running the test suite against a branch that fails the
tests I'm currently working on.

This patch simply adds the array created by --modules to the config hash
object displayed by the summary.

The new summary looks like:

  - Host Configuration Summary -
Platform for win2003sat windows-2003-amd64
Platform for qa-ubuntu-lucid ubuntu-10.04-i386
Role for win2003sat agent
Role for qa-ubuntu-lucid master
Role for qa-ubuntu-lucid agent
Ruby version for win2003sat ruby 1.8.7 (2011-12-28 patchlevel 357) [i386-mingw32]
Ruby version for qa-ubuntu-lucid ruby 1.8.7 (2010-01-10 patchlevel 249) [i486-linux]
Config Key|Val: modules ["[email protected]:jeffmccune/puppetlabs-registry.git#maint/master/add_acceptance_tests", "git://github.com/puppetlabs/puppetlabs-stdlib.git#master"]
Config Key|Val: filecount 12
Config Key|Val: puppet_ver "git://github.com/puppetlabs/puppet.git#2.7.x"
Config Key|Val: consoleport 443


    
  • Opened: Mon May 14 18:59:06 UTC 2012
  • Based on: puppetlabs:master (2881fbd39a2140750c3e4a3101ca817e6d76cf26)
  • Requested merge: jeffmccune:maint/master/add_modules_to_config_key_summary (edf329d2e2371abd74eb32e97ee0c27eb545d946)

Diff follows:

diff --git a/lib/test_config.rb b/lib/test_config.rb
index 9064dd6..aac7a02 100644
--- a/lib/test_config.rb
+++ b/lib/test_config.rb
@@ -24,6 +24,7 @@ def self.load_file(config_file)
     config['CONFIG']['pe_ver_win'] = puppet_enterprise_version_win if is_pe?
     config['CONFIG']['puppet_ver'] = Options.parse_args[:puppet] unless is_pe?
     config['CONFIG']['facter_ver'] = Options.parse_args[:facter] unless is_pe?
+    config['CONFIG']['modules'] = Options.parse_args[:modules] || []
     config['CONFIG']['hiera_ver'] = Options.parse_args[:hiera] unless is_pe?
     # need to load expect versions of PE binaries
     config['VERSION'] = YAML.load_file('ci/pe/pe_version') rescue nil if is_pe?

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to