aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-05-27 13:04:50 -0700
committerelijah <elijah@riseup.net>2014-05-27 13:04:50 -0700
commit658af826f95076b1739e922a7c0f3cde417571ed (patch)
tree4ee71485573f552947c635a2b29cc032190ca539
parenta327a0544bb725c668b7bca5bf6618c40a9c9cd2 (diff)
downloadleap_cli-658af826f95076b1739e922a7c0f3cde417571ed.tar.gz
leap_cli-658af826f95076b1739e922a7c0f3cde417571ed.tar.bz2
cap puppet verbosity level at 5 and capistrano logger at 3.
-rw-r--r--lib/leap_cli/commands/deploy.rb2
-rw-r--r--lib/leap_cli/util/remote_command.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb
index 09666ae..814407f 100644
--- a/lib/leap_cli/commands/deploy.rb
+++ b/lib/leap_cli/commands/deploy.rb
@@ -54,7 +54,7 @@ module LeapCli
end
unless options[:sync]
ssh.leap.log :applying, "puppet" do
- ssh.puppet.apply(:verbosity => LeapCli.log_level, :tags => tags(options), :force => options[:force])
+ ssh.puppet.apply(:verbosity => [LeapCli.log_level,5].min, :tags => tags(options), :force => options[:force])
end
end
end
diff --git a/lib/leap_cli/util/remote_command.rb b/lib/leap_cli/util/remote_command.rb
index b4b2b1f..6b4d75f 100644
--- a/lib/leap_cli/util/remote_command.rb
+++ b/lib/leap_cli/util/remote_command.rb
@@ -13,7 +13,7 @@ module LeapCli; module Util; module RemoteCommand
node_list = parse_node_list(nodes)
cap = new_capistrano
- cap.logger = LeapCli::Logger.new(:level => LeapCli.log_level)
+ cap.logger = LeapCli::Logger.new(:level => [LeapCli.log_level,3].min)
user = options[:user] || 'root'
cap.set :user, user
cap.set :ssh_options, ssh_options # ssh options common to all nodes