Merge pull request rubber#225 from pushcx/master

Bugfix for key_file auth failure
wr0ngway · Dec 9, 2012 · 977e800 · 977e800
2 parents 3adf542 + 5f7de4a
commit 977e800
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/rubber/recipes/rubber.rb b/lib/rubber/recipes/rubber.rb
@@ -63,7 +63,7 @@ def task(name, options={}, &block)
     # NOTE: for some reason Capistrano requires you to have both the public and
     # the private key in the same folder, the public key should have the
     # extension ".pub".
-    ssh_options[:keys] = cloud.env.key_file
+    ssh_options[:keys] = [cloud.env.key_file].flatten
     ssh_options[:timeout] = fetch(:ssh_timeout, 5)
   end
 

diff --git a/templates/graphite/templates.yml b/templates/graphite/templates.yml
@@ -1 +1,3 @@
 description: The graphite graphing module
+dependent_templates:
+  - collectd