opendev/system-config
Code Issues Proposed changes

Merge "Login with 'centos' user for node launch"

Browse Source
This commit is contained in:
Jenkins 2014-10-24 08:56:53 +00:00 committed by Gerrit Code Review
commit 198460f0ae
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launch/launch-node.py
View File

@ -64,7 +64,7 @@ def bootstrap_server(server, admin_pass, key, cert, environment, name,
else:
ssh_kwargs['password'] = admin_pass
for username in ['root', 'ubuntu']:
for username in ['root', 'ubuntu', 'centos']:
ssh_client = utils.ssh_connect(ip, username, ssh_kwargs, timeout=600)
if ssh_client:
break
@ -72,6 +72,9 @@ def bootstrap_server(server, admin_pass, key, cert, environment, name,
if not ssh_client:
raise Exception("Unable to log in via SSH")
# cloud-init puts the "please log in as user foo" message and
# subsequent exit() in root's authorized_keys -- overwrite it with
# a normal version to get root login working again.
if username != 'root':
ssh_client.ssh("sudo cp ~/.ssh/authorized_keys"
" ~root/.ssh/authorized_keys")