Revision 052783ff tools/setup-ssh
| b/tools/setup-ssh | ||
|---|---|---|
| 183 | 183 |
@param transport: The paramiko transport instance |
| 184 | 184 |
|
| 185 | 185 |
""" |
| 186 |
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
|
|
| 186 |
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.SSH_LOGIN_USER)
|
|
| 187 | 187 |
keyfiles = [ |
| 188 | 188 |
(pathutils.SSH_HOST_DSA_PRIV, 0600), |
| 189 | 189 |
(pathutils.SSH_HOST_DSA_PUB, 0644), |
| ... | ... | |
| 234 | 234 |
|
| 235 | 235 |
""" |
| 236 | 236 |
program = os.path.basename(sys.argv[0]) |
| 237 |
(default_key, _, _) = ssh.GetUserFiles(constants.SSH_LOGIN_USER) |
|
| 237 | 238 |
|
| 238 | 239 |
parser = optparse.OptionParser(usage=("%prog [--debug|--verbose] [--force]"
|
| 239 | 240 |
" <node> <node...>"), prog=program) |
| 240 | 241 |
parser.add_option(cli.DEBUG_OPT) |
| 241 | 242 |
parser.add_option(cli.VERBOSE_OPT) |
| 242 | 243 |
parser.add_option(cli.NOSSH_KEYCHECK_OPT) |
| 243 |
default_key = ssh.GetUserFiles(constants.GANETI_RUNAS)[0] |
|
| 244 | 244 |
parser.add_option(optparse.Option("-f", dest="private_key",
|
| 245 | 245 |
default=default_key, |
| 246 | 246 |
help="The private key to (try to) use for" |
| ... | ... | |
| 382 | 382 |
@return: paramiko.util.load_host_keys dict |
| 383 | 383 |
|
| 384 | 384 |
""" |
| 385 |
homedir = utils.GetHomeDir(constants.GANETI_RUNAS)
|
|
| 385 |
homedir = utils.GetHomeDir(constants.SSH_LOGIN_USER)
|
|
| 386 | 386 |
known_hosts = os.path.join(homedir, ".ssh", "known_hosts") |
| 387 | 387 |
|
| 388 | 388 |
try: |
| ... | ... | |
| 429 | 429 |
all_keys = LoadPrivateKeys(options) |
| 430 | 430 |
|
| 431 | 431 |
passwd = None |
| 432 |
username = constants.GANETI_RUNAS
|
|
| 432 |
username = constants.SSH_LOGIN_USER
|
|
| 433 | 433 |
ssh_port = netutils.GetDaemonPort("ssh")
|
| 434 | 434 |
host_keys = LoadKnownHosts() |
| 435 | 435 |
|
Also available in: Unified diff