General-host-aggregates part 1.

Partially implements blueprint general-host-aggregates: Xen decoupling

* keep rpcapi to compute-controller for Hypervisor-Pools
  *  Add compute_rpcapi.add_aggregate_host to libvirt
* Remove aggregate states
* Remove One aggregate per host restriction
* Keep Xen support for both hypervisor pools and aggregates

Change-Id: I6ac0f8b6fc31dff589363331e99e0755301f2172

1 files changed, 3 insertions, 4 deletions

diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py
index 834131f92..54eca8288 100644
--- a/nova/api/openstack/compute/contrib/aggregates.py
+++ b/nova/api/openstack/compute/contrib/aggregates.py
@@ -54,7 +54,7 @@ class AggregateController(object):
         return {'aggregates': aggregates}
 
     def create(self, req, body):
-        """Creates an aggregate, given its name and availablity_zone."""
+        """Creates an aggregate, given its name and availability_zone."""
         context = _get_context(req)
         authorize(context)
 
@@ -90,7 +90,7 @@ class AggregateController(object):
         return self._marshall_aggregate(aggregate)
 
     def update(self, req, id, body):
-        """Updates the name and/or availbility_zone of given aggregate."""
+        """Updates the name and/or availability_zone of given aggregate."""
         context = _get_context(req)
         authorize(context)
 
@@ -152,8 +152,7 @@ class AggregateController(object):
             LOG.exception(_("Cannot add host %(host)s in aggregate "
                             "%(id)s") % locals())
             raise exc.HTTPNotFound
-        except (exception.AggregateHostConflict,
-                exception.AggregateHostExists,
+        except (exception.AggregateHostExists,
                 exception.InvalidAggregateAction):
             LOG.exception(_("Cannot add host %(host)s in aggregate "
                             "%(id)s") % locals())