stackforge
/
satori
Code Issues Proposed changes

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
This commit is contained in:
Caleb Groom 2014-03-20 15:25:53 -05:00
parent 01ad34c89f
commit 7a11714010
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
satori/shell.py
View File

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