Greetings!

Please review the pull request #16: (#9515) Use key options opened by (bodepd)

Some more information about the pull request:

  • Opened: Thu Sep 15 16:39:28 UTC 2011
  • Based on: puppetlabs:master (9c6e010aa2464feadc21c59de621826ede79cdbe)
  • Requested merge: bodepd:9515_use_key_options (576c7784981b9a29b1485a6aef98626e0367a56c)

Description:

Need to update the CP setup script to use the new
key params.

Thanks!
The Pull Request Bot

Diff follows:

diff --git a/setup/cp_pe/01_setup_cloudmaster.rb b/setup/cp_pe/01_setup_cloudmaster.rb
index df7d302..4288a58 100644
--- a/setup/cp_pe/01_setup_cloudmaster.rb
+++ b/setup/cp_pe/01_setup_cloudmaster.rb
@@ -1,9 +1,10 @@
 require 'yaml'
-keypair='dans-new-key'
+keypair=@options[:keypair]
 host_config_file='tmp/host_config.yaml'
 save_config_file='tmp/host_save_config.yaml'
-# why does it allow multiple keys
-keyfile=@config['ssh'][:keys].first
+keyfile=@options[:keyfile]
+
+skip_test 'will not run without a keyfile and keypair' and break unless keypair and keyfile
 
 # sets up a cloud master
 # requies that pe-build is in the $PATH

    

--
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