summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-02-17 15:36:10 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2011-02-17 15:36:10 -0800
commitffa40f37662864ed0e40bd0239f75e48d4b73a6a (patch)
tree7bffff9a3e00b7574e31636ccfe50beecd88ea67 /nova/api
parent9a7213b615bcaa2127f76146d594f5247ea0d0a4 (diff)
parent76a82e57dfbca67e1e70a12db4f4b5c2111e4d93 (diff)
downloadnova-ffa40f37662864ed0e40bd0239f75e48d4b73a6a.tar.gz
nova-ffa40f37662864ed0e40bd0239f75e48d4b73a6a.tar.xz
nova-ffa40f37662864ed0e40bd0239f75e48d4b73a6a.zip
Merged with trunk
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 49611703a..0018b96f3 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,7 +195,8 @@ class Controller(wsgi.Controller):
display_description=env['server']['name'],
key_name=key_pair['name'],
key_data=key_pair['public_key'],
- metadata=metadata)
+ metadata=metadata,
+ onset_files=env.get('onset_files', []))
return _translate_keys(instances[0])
def update(self, req, id):