From de62e9087d55a9c89c9beb132408bf8ff1e57dcd Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Sun, 18 Dec 2011 19:50:34 -0800
Subject: 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
---
 nova/crypto.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
-- 
cgit