diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-17 15:27:20 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-17 15:27:20 -0400 |
| commit | ca267d0e52ed721f1236dc4b6030433fe92d0d51 (patch) | |
| tree | 5bae513d09c134eb76e8d43ad7bc3f2d112cf02b /nova | |
| parent | 137bbc37e9fb664d0b97a607b5f69c38df938077 (diff) | |
| download | nova-ca267d0e52ed721f1236dc4b6030433fe92d0d51.tar.gz nova-ca267d0e52ed721f1236dc4b6030433fe92d0d51.tar.xz nova-ca267d0e52ed721f1236dc4b6030433fe92d0d51.zip | |
Move the check for None personalities into the create method.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/servers.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 6dd66a9a5..c6422add4 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -172,8 +172,10 @@ class Controller(wsgi.Controller): for k, v in env['server']['metadata'].items(): metadata.append({'key': k, 'value': v}) - personality = env['server'].get('personality', []) - injected_files = self._get_injected_files(personality) + personality = env['server'].get('personality') + injected_files = [] + if personality: + injected_files = self._get_injected_files(personality) try: instances = self.compute_api.create( @@ -221,9 +223,6 @@ class Controller(wsgi.Controller): """ injected_files = [] - if not personality: - return injected_files - for item in personality: try: path = item['path'] |