From a71ff71e8b91b1d2f1ac97e170e6c60995679cd6 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Tue, 12 Feb 2013 22:51:57 +0000
Subject: Allow aggregate create to have None as the az

Aggregates do not require a zone any more, but in order to keep the current API,
Allow for availibilty zone to be set to None.

Fixes bug 1123468

Change-Id: I5209311f3417b5d7cdf343e5c06104357ed523d5
---
 nova/compute/api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index a5d8ab6e8..658673e50 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -2513,8 +2513,11 @@ class AggregateAPI(base.Base):
         """Creates the model for the aggregate."""
 
         values = {"name": aggregate_name}
+        metadata = None
+        if availability_zone:
+            metadata = {'availability_zone': availability_zone}
         aggregate = self.db.aggregate_create(context, values,
-                metadata={'availability_zone': availability_zone})
+                metadata=metadata)
         aggregate = self._get_aggregate_info(context, aggregate)
         # To maintain the same API result as before.
         del aggregate['hosts']
-- 
cgit