summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-12-18 19:50:34 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2011-12-18 19:50:34 -0800
commitde62e9087d55a9c89c9beb132408bf8ff1e57dcd (patch)
tree920083e6c6fdbd0974656fcaa6e55fa7eac0dde6
parentb60fcb547c228b989e20ea1d97b1192af96df3ee (diff)
Specify -t rsa when calling ssh-keygen.
Some operating systems (e.g. Illumos) don't default to RSA. Probably safer to specify it anyway, even on Linux where it defaults. Change-Id: I6f1364e6ff79a9c9a38007611b8df3af1b2dc645
-rw-r--r--nova/crypto.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index e97852572..790607c43 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -116,7 +116,7 @@ def generate_key_pair(bits=1024):
tmpdir = tempfile.mkdtemp()
keyfile = os.path.join(tmpdir, 'temp')
utils.execute('ssh-keygen', '-q', '-b', bits, '-N', '',
- '-f', keyfile)
+ '-t', 'rsa', '-f', keyfile)
fingerprint = generate_fingerprint('%s.pub' % (keyfile))
private_key = open(keyfile).read()
public_key = open(keyfile + '.pub').read()