summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-03-15 17:56:00 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-03-15 17:56:00 -0400
commite9ef6e04786a40d20f8022bec5d23d2e4503ce3a (patch)
treea1669a07d474dd89b317cebc5119a48cb71c732c /nova/api
parent1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9 (diff)
downloadnova-e9ef6e04786a40d20f8022bec5d23d2e4503ce3a.tar.gz
nova-e9ef6e04786a40d20f8022bec5d23d2e4503ce3a.tar.xz
nova-e9ef6e04786a40d20f8022bec5d23d2e4503ce3a.zip
s/onset_files/injected_files/g
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index adb5c5f99..42fe13619 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -169,7 +169,7 @@ class Controller(wsgi.Controller):
metadata.append({'key': k, 'value': v})
personality = env['server'].get('personality', [])
- onset_files = self._get_onset_files(personality)
+ injected_files = self._get_injected_files(personality)
try:
instances = self.compute_api.create(
@@ -183,7 +183,7 @@ class Controller(wsgi.Controller):
key_name=key_pair['name'],
key_data=key_pair['public_key'],
metadata=metadata,
- onset_files=onset_files)
+ injected_files=injected_files)
except QuotaError as error:
self._handle_quota_error(error)
@@ -207,15 +207,15 @@ class Controller(wsgi.Controller):
else:
return self._deserialize(request.body, request.get_content_type())
- def _get_onset_files(self, personality):
+ def _get_injected_files(self, personality):
"""
- Create a list of onset files from the personality attribute
+ Create a list of injected files from the personality attribute
- At this time, onset_files must be formatted as a list of
+ At this time, injected_files must be formatted as a list of
(file_path, file_content) pairs for compatibility with the
underlying compute service.
"""
- onset_files = []
+ injected_files = []
for item in personality:
try:
path = item['path']
@@ -230,8 +230,8 @@ class Controller(wsgi.Controller):
except TypeError:
msg = 'Personality content for %s cannot be decoded' % path
raise exc.HTTPBadRequest(explanation=msg)
- onset_files.append((path, contents))
- return onset_files
+ injected_files.append((path, contents))
+ return injected_files
def _handle_quota_errors(self, error):
"""