Add configuration for host/port. Might revert this later since running

on non-localhost is a potential paxos clusterfuck.

Author: coderanger

README.md

@@ -34,3 +34,9 @@ end
 This means that as soon as the cluster propagates a change, all `etcd-chef`
 daemons will activate. You may wish to set a `--splay` time if your recipe
 code involves non-local or contended resources.
+
+## Configuration
+
+By default an `etcd` instance on localhost will be used. You can customize this
+either via `--etcd-host` and `--etcd-port` command line options, or `etcd_host`
+and `etcd_port` in your configuration file.

lib/etcd-chef.rb

@@ -1,11 +1,28 @@
 require 'chef/application/solo'
+require 'chef/config'
 require 'etcd'
 
+class Chef
+  class Config
+    etcd_host 'localhost'
+    etcd_port 4001
+  end
+end
+
 module EtcdChef
   class Application < Chef::Application::Solo
     self.options = Chef::Application::Solo.options
     self.banner Chef::Application::Solo.banner
 
+    option :etcd_host,
+      :long  => '--etcd-host HOSTNAME',
+      :description => 'The etcd host to use'
+
+    option :etcd_port,
+      :long  => '--etcd-port PORT',
+      :description => 'The etcd port to use',
+      :proc => lambda { |s| s.to_i }
+
     def run_application
       Chef::Config[:cookbook_path] = [Chef::Config[:cookbook_path]] if Chef::Config[:cookbook_path].is_a?(String)
       Chef::Config[:cookbook_path].unshift(File.expand_path('../etcd-chef/cookbooks', __FILE__))
@@ -30,7 +47,7 @@ def run_chef_client
       @chef_client = nil
       # After CHEF-4546 replace ^^ with super
 
-      @etcd ||= Etcd.client # TODO: Config
+      @etcd ||= Etcd.client(host: Chef::Config[:etcd_host], port: Chef::Config[:etcd_port], read_timeout: 2592000) # Set the timeout 30 days, pending https://github.com/ranjib/etcd-ruby/pull/7
       Chef::Log.debug("Starting etcd watch from index #{@etcd_index || 'nil'}")
       @etcd_index = @etcd.watch('/', @etcd_index).index
     rescue Exception

lib/etcd-chef/dsl.rb

@@ -1,7 +1,7 @@
 class Chef
   class RunContext
     def etcd
-      @etcd_wrapper ||= EtcdWrapper.new(Etcd.client, [])
+      @etcd_wrapper ||= EtcdWrapper.new(Etcd.client(host: Chef::Config[:etcd_host], port: Chef::Config[:etcd_port]), [])
     end
   end