diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-12-05 22:46:47 -0500 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-12-05 22:46:47 -0500 |
| commit | f0e6bea08acd313d7d9acb0401a14befe1a31e43 (patch) | |
| tree | 414d51da4e374c32ed441d5d5aa37217af3db7af | |
| parent | 803f6f6af79c5424f46f3640f3bc8d4fcf6e78bd (diff) | |
Make admin_password keyword in compute manager run_instance method match
what we send in the compute API. Fixes bug #900591.
Change-Id: I857b7787189d454e8ed17a43654d6bf944da003e
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 311d17c6a..38cd6c31b 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -300,7 +300,7 @@ class ComputeManager(manager.SchedulerDependentManager): def _run_instance(self, context, instance_uuid, requested_networks=None, injected_files=[], - admin_pass=None, + admin_password=None, **kwargs): """Launch a new instance with specified options.""" context = context.elevated() @@ -315,7 +315,7 @@ class ComputeManager(manager.SchedulerDependentManager): block_device_info = self._prep_block_device(context, instance) instance = self._spawn(context, instance, image_meta, network_info, block_device_info, - injected_files, admin_pass) + injected_files, admin_password) except: with utils.save_and_reraise_exception(): self._deallocate_network(context, instance) |