auto-consul 0.0.2 → 0.0.3

data/bin/auto-consul

@@ -23,6 +23,14 @@ class Command < OpenStruct
     @state ||= AutoConsul::RunState::CLIProvider.new
   end
 
+  def heartbeat_addr
+    if advertise.nil?
+      bind
+    else
+      advertise
+    end
+  end
+
   def do_set_mode
     cluster.set_mode! local, expiry, servers
     # Healthy exit
@@ -41,7 +49,9 @@ class Command < OpenStruct
     runner = :agent_runner if local.agent?
     runner = :server_runner if local.server?
     runner = AutoConsul::Runner.method(runner)
-    monitor = runner.call(node, addr, expiry, local, cluster)
+    opt = {}
+    opt[:advertise] = advertise if ! advertise.nil?
+    monitor = runner.call(node, bind, expiry, local, cluster, opt)
     if with_heartbeat and ticks > 0
       monitor.while_up do |ap|
         # There's data exchange with the agent and with the registries
@@ -62,8 +72,8 @@ class Command < OpenStruct
 
   def do_heartbeat
     if state.running?
-      cluster.servers.heartbeat! node, addr, expiry if state.server?
-      cluster.agents.heartbeat! node, addr, expiry if state.agent?
+      cluster.servers.heartbeat! node, heartbeat_addr, expiry if state.server?
+      cluster.agents.heartbeat! node, heartbeat_addr, expiry if state.agent?
       # Healthy exit.
       0
     else
@@ -82,7 +92,9 @@ class Command < OpenStruct
   end
 end
 
-runner = Command.new(:data_dir => '/tmp/consul/state',
+runner = Command.new(:advertise => nil,
+                     :bind      => "0.0.0.0",
+                     :data_dir => '/tmp/consul/state',
                      :dc      => 'dc1',
                      :with_heartbeat => false,
                      :expiry  => 120,
@@ -102,7 +114,15 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-a", "--address IPADDR", String, "The IP address to bind to and announce for cluster communication.") do |a|
-    runner.addr = a
+    runner.advertise = runner.bind = a
+  end
+
+  opts.on("--advertise IPADDR", String, "The IP address to advertise for cluster communication.  Must be routable.  Defaults to the bound address.") do |a|
+    runner.advertise = a
+  end
+
+  opts.on("-b", "--bind IPADDR", String, "The IP address to bind to for cluster communication.  Defaults to 0.0.0.0, which consul handles specially.") do |a|
+    runner.bind = a
   end
 
   opts.on("-n", "--node NAME", String, "The unique name by which the node identifies itself within the cluster.") do |n|

data/lib/auto-consul/runner.rb

@@ -132,10 +132,12 @@ module AutoConsul
       end
     end
 
-    def self.joining_runner(agent_args, remote_ip=nil)
-      runner = AgentProcess.new(agent_args)
-      if not remote_ip.nil?
-        runner.on_up {|a| join remote_ip}
+    def self.joining_runner(agent_args, opt={})
+      opt_args = []
+      opt_args += ['-advertise', opt[:advertise]] if ! opt[:advertise].nil?
+      runner = AgentProcess.new(agent_args + opt_args)
+      if not opt[:remote_ip].nil?
+        runner.on_up {|a| join opt[:remote_ip]}
       end
       runner
     end
@@ -157,21 +159,21 @@ module AutoConsul
       hosts[0].data
     end
 
-    def self.agent_runner identity, bind_ip, expiry, local_state, registry
-      remote_ip = pick_joining_host(registry.agents.members(expiry))
+    def self.agent_runner identity, bind_ip, expiry, local_state, registry, opt={}
+      opt[:remote_ip] = pick_joining_host(registry.agents.members(expiry))
       joining_runner(['-bind', bind_ip,
                       '-data-dir', local_state.data_path,
-                      '-node', identity], remote_ip)
+                      '-node', identity], opt)
     end
 
-    def self.server_runner identity, bind_ip, expiry, local_state, registry
+    def self.server_runner identity, bind_ip, expiry, local_state, registry, opt={}
       members = registry.servers.members(expiry)
-      remote_ip = members.size > 0 ? pick_joining_host(members) : nil
+      opt[:remote_ip] = members.size > 0 ? pick_joining_host(members) : nil
 
       args = ['-bind', bind_ip, '-data-dir', local_state.data_path, '-node', identity, '-server']
       args << '-bootstrap' if members.size < 1
 
-      joining_runner(args, remote_ip)
+      joining_runner(args, opt)
     end
   end
 end

data/spec/runner_spec.rb

@@ -88,7 +88,10 @@ shared_examples_for 'a consul agent process runner' do |method_name, registry_na
     end
 
     callable = AutoConsul::Runner.method(method_name)
-    expect(callable.call(identity, ip, expiry, local_state, registry)).to be(runner)
+
+    args = [identity, ip, expiry, local_state, registry]
+    args << {:advertise => advertise_ip} unless advertise_ip.nil?
+    expect(callable.call(*args)).to be(runner)
   end
 end
 
@@ -420,8 +423,11 @@ describe AutoConsul::Runner::AgentProcess do
   end
 end
 
+ADVERTISE_IP = "172.17.0.31"
+
 describe AutoConsul::Runner do
   let(:ip) { "192.168.50.101" }
+  let(:advertise_ip) { nil && :foo }
   let(:remote_ip) { "192.168.50.102" }
   let(:member) { double("ClusterMember", :identity => 'foo', :time => double, :data => remote_ip) }
   let(:agents_list) { [] }
@@ -440,20 +446,41 @@ describe AutoConsul::Runner do
   end
 
   describe :agent_runner do
-    it_behaves_like 'a consul agent process runner', :agent_runner, :agents, true, []
+    describe 'with no advertise IP' do
+      it_behaves_like 'a consul agent process runner', :agent_runner, :agents, true, []
+    end
+
+    describe 'with an advertise IP' do
+        let(:advertise_ip) { ADVERTISE_IP }
+      it_behaves_like 'a consul agent process runner', :agent_runner, :agents, true, ['-advertise', ADVERTISE_IP]
+    end
   end
 
   describe :server_runner do
     describe 'with empty server registry' do
-      # consul agent -bind 192.168.50.100 -data-dir /opt/consul/server/data -node vagrant-server -server -bootstrap
-      it_behaves_like 'a consul agent process runner', :server_runner, :servers, false, ['-server', '-bootstrap']
+      describe 'with no advertise IP' do
+        # consul agent -bind 192.168.50.100 -data-dir /opt/consul/server/data -node vagrant-server -server -bootstrap
+        it_behaves_like 'a consul agent process runner', :server_runner, :servers, false, ['-server', '-bootstrap']
+      end
+
+      describe 'with an advertise IP' do
+        let(:advertise_ip) { ADVERTISE_IP }
+        # consul agent -bind 192.168.50.100 -data-dir /opt/consul/server/data -node vagrant-server -advertise 172.17.0.31 -server -bootstrap
+        it_behaves_like 'a consul agent process runner', :server_runner, :servers, false, ['-server', '-bootstrap', '-advertise', ADVERTISE_IP]
+      end
     end
 
     describe 'with other servers in registry' do
-      # consul agent -bind 192.168.50.100 -data-dir /opt/consul/server/data -node vagrant-server -server
-      # consul join some_ip
+      describe 'and no advertise IP' do
+        # consul agent -bind 192.168.50.100 -data-dir /opt/consul/server/data -node vagrant-server -server
+        # consul join some_ip
+        it_behaves_like 'a consul agent process runner', :server_runner, :servers, true, ['-server']
+      end
 
-      it_behaves_like 'a consul agent process runner', :server_runner, :servers, true, ['-server']
+      describe 'and an advertise IP' do
+        let(:advertise_ip) { ADVERTISE_IP }
+        it_behaves_like 'a consul agent process runner', :server_runner, :servers, true, ['-server', '-advertise', ADVERTISE_IP]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-consul
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: