diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-05-24 21:09:43 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-05-24 21:09:43 -0700 |
| commit | e0aa1369d8050f023fee1e60b276d44a6298feb9 (patch) | |
| tree | e4fd4a64fc1c6e8bbd8f0c69022003963a9eea14 /nova/api | |
| parent | 6f3f188e4ca9136f293ecf4b9813a7615c7a5929 (diff) | |
instead of the API spawning a greenthread to wait for a host to be picked,
the instance to boot, etc for setting the admin password... let's push the admin password down to the scheduler so that compute can just take care of setting the password as a part of the build process.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index fcb630fae..789c69977 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -180,7 +180,8 @@ class Controller(common.OpenstackController): key_name=key_name, key_data=key_data, metadata=env['server'].get('metadata', {}), - injected_files=injected_files) + injected_files=injected_files, + admin_password=password) except quota.QuotaError as error: self._handle_quota_error(error) @@ -190,8 +191,6 @@ class Controller(common.OpenstackController): builder = self._get_view_builder(req) server = builder.build(inst, is_detail=True) server['server']['adminPass'] = password - self.compute_api.set_admin_password(context, server['server']['id'], - password) return server def _deserialize_create(self, request): |