Merge lp:~jk0/nova/lp718847 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Friendlier error message if there are no compute nodes are available.

[Vish Ishaya (vishvananda)]

cool, that looks much better. LGTM

review: Approve

[Sandy Walsh (sandy-walsh)]

yup

review: Approve

=== modified file 'nova/scheduler/chance.py'
--- nova/scheduler/chance.py	2011-03-31 18:08:49 +0000
+++ nova/scheduler/chance.py	2011-03-31 19:38:34 +0000
@@ -35,6 +35,6 @@
         hosts = self.hosts_up(context, topic)
         if not hosts:
             raise driver.NoValidHost(_("Scheduler was unable to locate a host"
-                                       " for this request. Is the compute node"
-                                       " running?"))
+                                       " for this request. Is the appropriate"
+                                       " service running?"))
         return hosts[int(random.random() * len(hosts))]

=== modified file 'nova/scheduler/simple.py'
--- nova/scheduler/simple.py	2011-01-27 22:14:10 +0000
+++ nova/scheduler/simple.py	2011-03-31 19:38:34 +0000
@@ -72,7 +72,9 @@
                                    {'host': service['host'],
                                     'scheduled_at': now})
                 return service['host']
-        raise driver.NoValidHost(_("No hosts found"))
+        raise driver.NoValidHost(_("Scheduler was unable to locate a host"
+                                   " for this request. Is the appropriate"
+                                   " service running?"))
 
     def schedule_create_volume(self, context, volume_id, *_args, **_kwargs):
         """Picks a host that is up and has the fewest volumes."""
@@ -107,7 +109,9 @@
                                  {'host': service['host'],
                                   'scheduled_at': now})
                 return service['host']
-        raise driver.NoValidHost(_("No hosts found"))
+        raise driver.NoValidHost(_("Scheduler was unable to locate a host"
+                                   " for this request. Is the appropriate"
+                                   " service running?"))
 
     def schedule_set_network_host(self, context, *_args, **_kwargs):
         """Picks a host that is up and has the fewest networks."""
@@ -119,4 +123,6 @@
                 raise driver.NoValidHost(_("All hosts have too many networks"))
             if self.service_is_up(service):
                 return service['host']
-        raise driver.NoValidHost(_("No hosts found"))
+        raise driver.NoValidHost(_("Scheduler was unable to locate a host"
+                                   " for this request. Is the appropriate"
+                                   " service running?"))

=== modified file 'nova/scheduler/zone.py'
--- nova/scheduler/zone.py	2011-01-11 22:27:36 +0000
+++ nova/scheduler/zone.py	2011-03-31 19:38:34 +0000
@@ -52,5 +52,8 @@
         zone = _kwargs.get('availability_zone')
         hosts = self.hosts_up_with_zone(context, topic, zone)
         if not hosts:
-            raise driver.NoValidHost(_("No hosts found"))
+            raise driver.NoValidHost(_("Scheduler was unable to locate a host"
+                                       " for this request. Is the appropriate"
+                                       " service running?"))
+
         return hosts[int(random.random() * len(hosts))]