summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-03-17 09:55:41 -0400
committerDan Prince <dan.prince@rackspace.com>2011-03-17 09:55:41 -0400
commit732633c93f8d8cf71875d2caf096c9efbcf9dbce (patch)
tree0f64d48c1c693608bae44654d75e0ef3029494dd /nova/api
parent699abfe9e645ddbc854b42725247ab8fcd61517e (diff)
Update the Openstack API to handle case where personality is set but
null in the request to create a server.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 3ecd4fb01..bf21ed17f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -220,6 +220,11 @@ class Controller(wsgi.Controller):
underlying compute service.
"""
injected_files = []
+
+ # NOTE(dprince): handle case where 'personality: null' is in JSON req
+ if not personality:
+ return injected_files
+
for item in personality:
try:
path = item['path']