From 3a7571cc84a0b88ddc8ddf01e929e11ce8b041eb Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Mon, 30 Apr 2018 13:47:04 -0700
Subject: Fix erb source location
Signed-off-by: Tim Smith <tsmith@chef.io>
---
lib/chef/resource/ssh_known_hosts_entry.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'lib')
diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb
index ded80b6a53..c3fcd15627 100644
--- a/lib/chef/resource/ssh_known_hosts_entry.rb
+++ b/lib/chef/resource/ssh_known_hosts_entry.rb
@@ -40,7 +40,7 @@ class Chef
default: "rsa"
property :port, Integer,
- description: "The server port that ssh-keyscan will use to gather the public key.",
+ description: "The server port that the ssh-keyscan command will use to gather the public key.",
default: 22
property :timeout, Integer,
@@ -88,7 +88,8 @@ class Chef
r = with_run_context :root do
find_resource(:template, "update ssh known hosts file #{new_resource.file_location}") do
- source "ssh_known_hosts.erb"
+ source ::File.expand_path("../support/ssh_known_hosts.erb", __FILE__)
+ local true
path new_resource.file_location
owner new_resource.owner
group new_resource.group
--
cgit v1.2.1