Please review pull request #141: remove autosign default from with_master_running_on opened by (cprice-puppet)
Description:
The previous change set added some additional default arguments for "with_master_running_on". One of those was "--autosign". This commit removes that argument from the defaults.
- Opened: Fri Feb 10 17:42:55 UTC 2012
- Based on: puppetlabs:master (5c1e171912a62e8135a0de2319e22a412ddbcf8e)
- Requested merge: cprice-puppet:default-args-for-with-master (23eac62bb9506768e7ad4a6ee0ffddb8d98fb7b2)
Diff follows:
diff --git a/lib/test_case.rb b/lib/test_case.rb
index 2007015..9cc3612 100644
--- a/lib/test_case.rb
+++ b/lib/test_case.rb
@@ -272,7 +272,6 @@ def run_cron_on(host, action, user, entry="", &block)
# * --daemonize
# * --logdest="#{host['puppetvardir']}/log/puppetmaster.log"
# * --dns_alt_names="puppet, $(hostname -s), $(hostname -f)"
- # * --autosign=true
def with_master_running_on(host, arg='--daemonize', &block)
# they probably want to run with daemonize. If they pass some other arg/args but forget to re-include
# daemonize, we'll check and make sure they didn't explicitly specify "no-daemonize", and, failing that,
@@ -281,7 +280,6 @@ def with_master_running_on(host, arg='--daemonize', &block)
if (arg !~ /--logdest/) then arg << " --logdest=\"#{master['puppetvardir']}/log/puppetmaster.log\"" end
if (arg !~ /--dns_alt_names/) then arg << " --dns_alt_names=\"puppet, $(hostname -s), $(hostname -f)\"" end
- if (arg !~ /--autosign/) then arg << " --autosign=true" end
on hosts, host_command('rm -rf #{host["puppetpath"]}/ssl')
agents.each do |agent|
