From 1f2d573b830d14d16f6a1ab72f6c6429c2db458b Mon Sep 17 00:00:00 2001
From: Emmanuel Sciara <emmanuel.sciara@gmail.com>
Date: Sat, 13 Dec 2014 01:03:15 +0100
Subject: [PATCH] added a knife.rb file to prevent that other knife.rb
 configuration on the system is used

---
 .chef/knife.rb | 8 ++++++++
 .gitignore     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .chef/knife.rb

diff --git a/.chef/knife.rb b/.chef/knife.rb
new file mode 100644
index 0000000..bc77d2d
--- /dev/null
+++ b/.chef/knife.rb
@@ -0,0 +1,8 @@
+# This file exists mainly to ensure we don't pick up knife.rb from anywhere else
+config_dir "#{File.expand_path('..', __FILE__)}/" # Wherefore art config_dir, chef?
+
+# Chef 11.14 binds to "localhost", which interferes with port forwarding on IPv6 machines for some reason
+begin
+  chef_zero.host '127.0.0.1'
+rescue
+end
diff --git a/.gitignore b/.gitignore
index b55c093..48467c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.chef
+.chef/local-mode-cache/
 *.lock
 clients/
 cookbooks/