Add configuration option for using the public IP.

lib/tugboat/config.rb

@@ -53,6 +53,10 @@ def ssh_port
       @data['ssh']['ssh_port']
     end
 
+    def use_public_ip
+      @data['use_public_ip']
+    end
+
     def default_region
       @data['defaults'].nil? ? DEFAULT_REGION : @data['defaults']['region']
     end

lib/tugboat/middleware/ssh_droplet.rb

@@ -24,12 +24,23 @@ def call(env)
         end
 
         ssh_user = env["user_droplet_ssh_user"] || env["config"].ssh_user
-        host_string = "#{ssh_user}@#{env["droplet_ip"]}"
 
-        if env["droplet_ip_private"] and not env["user_droplet_use_public_ip"]
-          host_string = "#{ssh_user}@#{env["droplet_ip_private"]}"
+        host_ip = env["droplet_ip"]
+
+        if env["droplet_ip_private"]
+          use_public_ip = env["config"].use_public_ip
+
+          if not env["user_droplet_use_public_ip"].nil?
+            use_public_ip = env["user_droplet_use_public_ip"]
+          end
+
+          if not use_public_ip
+            host_ip = env["droplet_ip_private"]
+          end
         end
 
+        host_string = "#{ssh_user}@#{host_ip}"
+
         options << host_string
 
         if env["user_droplet_ssh_command"]

spec/middleware/ssh_droplet_spec.rb

@@ -50,6 +50,25 @@
       described_class.new(app).call(env)
     end
 
+    it "executes ssh using public ip setting from config" do
+      config.data["use_public_ip"] = true
+
+      expect(Kernel).to receive(:exec).with("ssh",
+                        "-o", "IdentitiesOnly=yes",
+                        "-o", "LogLevel=ERROR",
+                        "-o", "StrictHostKeyChecking=no",
+                        "-o", "UserKnownHostsFile=/dev/null",
+                        "-i", ssh_key_path,
+                        "-p", ssh_port,
+                        "#{ssh_user}@#{droplet_ip}")
+
+      env["droplet_ip"] = droplet_ip
+      env["droplet_ip_private"] = droplet_ip_private
+      env["config"] = config
+
+      described_class.new(app).call(env)
+    end
+
   end
 
 end