From 0626def72e8c2271ef72910c1a2f64015ac9c38b Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Fri, 27 Jul 2012 11:24:06 +1000
Subject: Only enforce valid uuids if a uuid is passed.

This fixes bug 1029721 which was causing instance spawn failures.

Change-Id: Iab7fdb063874972e0bcd91c51bfd0e5b49e8023c
---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index ac56e5983..c0dfd5cbb 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1031,7 +1031,7 @@ def fixed_ip_associate(context, address, instance_uuid, network_id=None,
 @require_admin_context
 def fixed_ip_associate_pool(context, network_id, instance_uuid=None,
                             host=None):
-    if not utils.is_uuid_like(instance_uuid):
+    if instance_uuid and not utils.is_uuid_like(instance_uuid):
         raise exception.InvalidUUID(uuid=instance_uuid)
 
     session = get_session()
-- 
cgit