From f732831bf4f0c5581b28322d76fb13a17cd65839 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 9 Jun 2011 20:11:55 +0000
Subject: Record architecture of image for matching to agent build later. Add
 code to automatically update agent running on instance on instance creation.

---
 nova/compute/api.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index b0949a729..e1eea67e6 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -164,6 +164,9 @@ class API(base.Base):
         os_type = None
         if 'properties' in image and 'os_type' in image['properties']:
             os_type = image['properties']['os_type']
+        architecture = None
+        if 'properties' in image and 'arch' in image['properties']:
+            architecture = image['properties']['arch']
 
         if kernel_id is None:
             kernel_id = image['properties'].get('kernel_id', None)
@@ -222,7 +225,8 @@ class API(base.Base):
             'locked': False,
             'metadata': metadata,
             'availability_zone': availability_zone,
-            'os_type': os_type}
+            'os_type': os_type,
+            'architecture': architecture}
 
         return (num_instances, base_options, security_groups)
 
-- 
cgit 


From fa0b64b500f3a196044459ba4bf8ed0dea214e92 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 9 Jun 2011 22:04:32 +0000
Subject: Add test for agent update

---
 nova/compute/manager.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 245958de7..3a91908af 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -470,6 +470,24 @@ class ComputeManager(manager.SchedulerDependentManager):
         LOG.audit(msg)
         self.driver.inject_file(instance_ref, path, file_contents)
 
+    @exception.wrap_exception
+    @checks_instance_lock
+    def agent_update(self, context, instance_id, url, md5hash):
+        """Update agent running on an instance on this host."""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+        instance_id = instance_ref['id']
+        instance_state = instance_ref['state']
+        expected_state = power_state.RUNNING
+        if instance_state != expected_state:
+            LOG.warn(_('trying to update agent on a non-running '
+                    'instance: %(instance_id)s (state: %(instance_state)s '
+                    'expected: %(expected_state)s)') % locals())
+        nm = instance_ref['name']
+        msg = _('instance %(nm)s: updating agent to %(url)s') % locals()
+        LOG.audit(msg)
+        self.driver.agent_update(instance_ref, url, md5hash)
+
     @exception.wrap_exception
     @checks_instance_lock
     def rescue_instance(self, context, instance_id):
-- 
cgit