diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-05-13 15:20:29 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-13 15:20:29 +0000 |
| commit | c2455378bcdc03ba5c4c9cd010768f0eccf22406 (patch) | |
| tree | 3409b5f4b6c59a304634ceea1b8189d5d4852f30 | |
| parent | 0576766cdf3480ad02159671d2dfc0bdcb154934 (diff) | |
| parent | 31820248e8d886d37add963f0709f3658fd6087d (diff) | |
| download | nova-c2455378bcdc03ba5c4c9cd010768f0eccf22406.tar.gz nova-c2455378bcdc03ba5c4c9cd010768f0eccf22406.tar.xz nova-c2455378bcdc03ba5c4c9cd010768f0eccf22406.zip | |
Update the compute manager so that it breaks out of a loop if set_admin_password is not implemented by the driver. This avoids excessively logging NotImplementedError exceptions.
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 556b3b3b9..149147460 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -426,6 +426,12 @@ class ComputeManager(manager.SchedulerDependentManager): LOG.audit(_("Instance %s: Root password set"), instance_ref["name"]) break + except NotImplementedError: + # NOTE(dprince): if the driver doesn't implement + # set_admin_password we break to avoid a loop + LOG.warn(_('set_admin_password is not implemented ' + 'by this driver.')) + break except Exception, e: # Catch all here because this could be anything. LOG.exception(e) |