zuul/nodepool
Code Issues Proposed changes

Merge "Add cloud-user to non-root user list"

Browse Source
This commit is contained in:
Jenkins 2014-05-28 20:43:30 +00:00 committed by Gerrit Code Review
commit f03b6d6aa7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/nodepool.py
View File

@ -824,7 +824,7 @@ class ImageUpdater(threading.Thread):
# We have connected to the node but couldn't do anything as root # We have connected to the node but couldn't do anything as root
# try distro specific users, since we know ssh is up (a timeout # try distro specific users, since we know ssh is up (a timeout
# didn't occur), we can connect with a very sort timeout. # didn't occur), we can connect with a very sort timeout.
for username in ['ubuntu', 'fedora']: for username in ['ubuntu', 'fedora', 'cloud-user']:
try: try:
host = utils.ssh_connect(server['public_v4'], username, host = utils.ssh_connect(server['public_v4'], username,
ssh_kwargs, ssh_kwargs,