From f2ad7160680b0c14892e62d3d6e96225f0c38e68 Mon Sep 17 00:00:00 2001
From: Harpreet Singh Gulati <harpreet@mesosphere.io>
Date: Fri, 12 Feb 2016 11:08:12 -0800
Subject: [PATCH] Don't use core as the user when an ssh config is provided

---
 cli/dcoscli/service/main.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cli/dcoscli/service/main.py b/cli/dcoscli/service/main.py
index 230705c..8953fc0 100644
--- a/cli/dcoscli/service/main.py
+++ b/cli/dcoscli/service/main.py
@@ -271,9 +271,14 @@ def _log_marathon(follow, lines, ssh_config_file):
 
     leader_ip = marathon.create_client().get_leader().split(':')[0]
 
-    cmd = ("ssh {0}core@{1} " +
-           "journalctl {2}-u dcos-marathon").format(
+    user_string = 'core@'
+    if ssh_config_file:
+        user_string = ''
+
+    cmd = ("ssh {0}{1}{2} " +
+           "journalctl {3}-u dcos-marathon").format(
                ssh_options,
+               user_string,
                leader_ip,
                journalctl_args)