Only attempt remote logins if directed by the user

Since the system info plugin was defaulting to ohai-solo this
commit moves the check for the user's intention up.

Change-Id: Iccbbd882371131c930f7a951cc88c5628c290464
Closes-Bug: 1295315

satori/shell.py

@@ -201,14 +201,15 @@ def parse_args(argv):
 
     username, url = netloc_parser(config.netloc)
     config.netloc = url
+
+    if (config.host_key or config.username) and not config.system_info:
+        config.system_info = 'ohai-solo'
+
     if username:
         config.host_username = username
     else:
         config.host_username = 'root'
 
-    if (config.host_key or config.host_username) and not config.system_info:
-        config.system_info = 'ohai-solo'
-
     return config