From 95fe2026e869e2da29196f8bf3e48ae2a2560e46 Mon Sep 17 00:00:00 2001
From: Masanori Itoh <itoumsn@nttdata.co.jp>
Date: Tue, 5 Apr 2011 02:04:58 +0900
Subject: Moved 'name' property from <imageId> to <imageLocation>, corrected
 <imageType> and fixes bug # 750482.

---
 nova/api/ec2/cloud.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'nova')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 425784e8a..ecf144452 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -886,10 +886,7 @@ class CloudController(object):
         image_type = image['properties'].get('type')
         ec2_id = self._image_ec2_id(image.get('id'), image_type)
         name = image.get('name')
-        if name:
-            i['imageId'] = "%s (%s)" % (ec2_id, name)
-        else:
-            i['imageId'] = ec2_id
+        i['imageId'] = ec2_id
         kernel_id = image['properties'].get('kernel_id')
         if kernel_id:
             i['kernelId'] = self._image_ec2_id(kernel_id, 'kernel')
@@ -897,11 +894,15 @@ class CloudController(object):
         if ramdisk_id:
             i['ramdiskId'] = self._image_ec2_id(ramdisk_id, 'ramdisk')
         i['imageOwnerId'] = image['properties'].get('owner_id')
-        i['imageLocation'] = image['properties'].get('image_location')
+        if name:
+            i['imageLocation'] = "%s (%s)" % (image['properties'].
+                                              get('image_location'), name)
+        else:
+            i['imageLocation'] = image['properties'].get('image_location')
         i['imageState'] = image['properties'].get('image_state')
-        i['displayName'] = image.get('name')
+        i['displayName'] = name
         i['description'] = image.get('description')
-        i['type'] = image_type
+        i['imageType'] = image_type
         i['isPublic'] = str(image['properties'].get('is_public', '')) == 'True'
         i['architecture'] = image['properties'].get('architecture')
         return i
-- 
cgit 


From 6c8c454826263b334eb674c9ab1c8d62e5fd491f Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 14:55:19 +0200
Subject: Help paste_config_file find the api config now that we moved it.

---
 nova/wsgi.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova')

diff --git a/nova/wsgi.py b/nova/wsgi.py
index ba0819466..05e7d5924 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -532,6 +532,7 @@ def paste_config_file(basename):
     """
 
     configfiles = [basename,
+                   os.path.join(FLAGS.state_path, 'etc', 'nova', basename),
                    os.path.join(FLAGS.state_path, 'etc', basename),
                    os.path.join(FLAGS.state_path, basename),
                    '/etc/nova/%s' % basename]
-- 
cgit 


From f1f8e00dc420bbc78b8d143c56375afc721c4c7d Mon Sep 17 00:00:00 2001
From: Chuck Short <zulcss@ubuntu.com>
Date: Tue, 5 Apr 2011 10:17:29 -0400
Subject: Dont configure vnc if we are using lxc

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

(limited to 'nova')

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index babbc610d..2be190256 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -970,7 +970,8 @@ class LibvirtConnection(driver.ComputeDriver):
                     'nics': nics}
 
         if FLAGS.vnc_enabled:
-            xml_info['vncserver_host'] = FLAGS.vncserver_host
+            if FLAGS.libvirt_type != 'lxc':
+                xml_info['vncserver_host'] = FLAGS.vncserver_host
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"
-- 
cgit