]> gitweb.fluxo.info Git - leap/leap_cli.git/commitdiff
cap puppet verbosity level at 5 and capistrano logger at 3.
authorelijah <elijah@riseup.net>
Tue, 27 May 2014 20:04:50 +0000 (13:04 -0700)
committerelijah <elijah@riseup.net>
Tue, 27 May 2014 20:04:50 +0000 (13:04 -0700)
lib/leap_cli/commands/deploy.rb
lib/leap_cli/util/remote_command.rb

index 09666ae66f1a3cffa4d7fb75fa57c528e1e2588c..814407f1185163fc083776f6cfaae1ca9172903c 100644 (file)
@@ -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
index b4b2b1fc079cef2de5e61f186e82373c06ff0f8b..6b4d75fd4f409a3ea2a7fca4de1cc51a17fc4710 100644 (file)
@@ -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