use skip_on_duplicated_fqdns as command option

Signed-off-by: linyows <linyows@gmail.com>

2 files changed, 16 insertions, 6 deletions

diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 01af582ee4..b824f5262a 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -123,6 +123,11 @@ class Chef
         :boolean => true,
         :proc => Proc.new { :raise }
 
+      option :skip_on_duplicated_fqdns,
+        :long => "--skip-on-duplicated-fqdns",
+        :description => "Skip exits even if FQDNs are duplicated",
+        :boolean => true
+
       option :tmux_split,
         :long => "--tmux-split",
         :description => "Split tmux window.",
@@ -177,11 +182,14 @@ class Chef
           end
           exit 10
         end
-        fqdns = list.map { |v| v[0] }
-        if fqdns.count != fqdns.uniq.count
-          duplicated_fqdns = fqdns.uniq
-          ui.warn("SSH #{duplicated_fqdns.count > 1 ? 'nodes are' : 'node is'} " +
-                  "duplicated: #{duplicated_fqdns.join(',')}")
+        unless config[:skip_on_duplicated_fqdns]
+          fqdns = list.map { |v| v[0] }
+          if fqdns.count != fqdns.uniq.count
+            duplicated_fqdns = fqdns.uniq
+            ui.warn("SSH #{duplicated_fqdns.count > 1 ? 'nodes are' : 'node is'} " +
+                    "duplicated: #{duplicated_fqdns.join(',')}")
+            exit 10
+          end
         end
         session_from_list(list)
       end
diff --git a/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb
index c0ef9e4116..1628fa1dad 100644
--- a/spec/unit/knife/ssh_spec.rb
+++ b/spec/unit/knife/ssh_spec.rb
@@ -140,12 +140,14 @@ describe Chef::Knife::Ssh do
 
       context "when there are some hosts found but IPs duplicated" do
         before do
+          @knife.config[:skip_on_duplicated_fqdns] = false
           @node_foo["fqdn"] = "foo.example.org"
           @node_bar["fqdn"] = "foo.example.org"
         end
 
-        it "should be warned" do
+        it "should raise a specific error" do
           expect(@knife.ui).to receive(:warn).with(/^SSH node is duplicated: foo\.example\.org/)
+          expect(@knife).to receive(:exit).with(10)
           expect(@knife).to receive(:session_from_list).with([
             ["foo.example.org", nil, nil],
             ["foo.example.org", nil, nil],