From 6f274d0a5818633b072e432ba7182650f0d30001 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Wed, 30 Mar 2011 15:28:21 +0200
Subject: Do not push 'None' to authorized_keys when no key is specified

---
 nova/virt/libvirt_conn.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index b28584cb6..f34ea7225 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -828,7 +828,10 @@ class LibvirtConnection(driver.ComputeDriver):
         if FLAGS.libvirt_type == 'lxc':
             target_partition = None
 
-        key = str(inst['key_data'])
+        if inst['key_data']:
+            key = str(inst['key_data'])
+        else:
+            key = None
         net = None
 
         nets = []
-- 
cgit