Revision a1b805fb
b/lib/backend.py | ||
---|---|---|
260 | 260 |
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS, |
261 | 261 |
mkdir=True) |
262 | 262 |
except errors.OpExecError, err: |
263 |
logging.exception("Error while processing user ssh files") |
|
264 |
return False |
|
263 |
msg = "Error while processing user ssh files" |
|
264 |
logging.exception(msg) |
|
265 |
return (False, "%s: %s" % (msg, err)) |
|
265 | 266 |
|
266 | 267 |
for name, content in [(priv_key, sshkey), (pub_key, sshpub)]: |
267 | 268 |
utils.WriteFile(name, data=content, mode=0600) |
... | ... | |
270 | 271 |
|
271 | 272 |
utils.RunCmd([constants.SSH_INITD_SCRIPT, "restart"]) |
272 | 273 |
|
273 |
return True
|
|
274 |
return (True, "Node added successfully")
|
|
274 | 275 |
|
275 | 276 |
|
276 | 277 |
def LeaveCluster(): |
b/lib/cmdlib.py | ||
---|---|---|
2129 | 2129 |
keyarray[2], |
2130 | 2130 |
keyarray[3], keyarray[4], keyarray[5]) |
2131 | 2131 |
|
2132 |
if result.failed or not result.data: |
|
2133 |
raise errors.OpExecError("Cannot transfer ssh keys to the new node") |
|
2132 |
msg = result.RemoteFailMsg() |
|
2133 |
if msg: |
|
2134 |
raise errors.OpExecError("Cannot transfer ssh keys to the" |
|
2135 |
" new node: %s" % msg) |
|
2134 | 2136 |
|
2135 | 2137 |
# Add node to our /etc/hosts, and add key to known_hosts |
2136 | 2138 |
utils.AddHostToEtcHosts(new_node.name) |
Also available in: Unified diff