summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-15 11:19:27 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-15 11:19:27 -0600
commit03a8d1baae00a4150a02ac2f0b04c413dd3b00e0 (patch)
treea560958e9bd73998e1852d9b723c05c168a5bd03
parentbf82637cad867b0e8fb6ad868f60c6dcd66d7f97 (diff)
downloadnova-03a8d1baae00a4150a02ac2f0b04c413dd3b00e0.tar.gz
nova-03a8d1baae00a4150a02ac2f0b04c413dd3b00e0.tar.xz
nova-03a8d1baae00a4150a02ac2f0b04c413dd3b00e0.zip
derp
-rw-r--r--nova/compute/manager.py2
-rw-r--r--nova/virt/xenapi_conn.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 7e929d715..546d07a09 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -440,7 +440,7 @@ class ComputeManager(manager.Manager):
#after resizing
service = self.db.service_get_by_host_and_topic(context,
- migration_ref['dest_host'], FLAGS.compute_topic)
+ migration_ref['dest_compute'], FLAGS.compute_topic)
topic = self.db.queue_get_for(context, FLAGS.compute_topic,
service['host'])
rpc.cast(context, topic,
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 19b5269f5..2671f1a7b 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -226,7 +226,7 @@ class XenAPIConnection(object):
return self._vmops.get_ajax_console(instance)
def get_host_ip_addr(self):
- xs_url = urlparse.urlpase(FLAGS.xenapi_connection_url)
+ xs_url = urlparse.urlparse(FLAGS.xenapi_connection_url)
return xs_url.netloc
def attach_volume(self, instance_name, device_path, mountpoint):