diff options
| author | Josh Kearney <josh@jk0.org> | 2011-05-13 10:27:15 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-05-13 10:27:15 -0500 |
| commit | 26ed22eac0f5edc5dcca92b55f64bb4aae8aac93 (patch) | |
| tree | 7d27a303ccafeab3a849ec03860c256462be3fde | |
| parent | 60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008 (diff) | |
| parent | e12c1fb484f7cd6cbd4417a139e91a1b4f743766 (diff) | |
Merged trunk.
| -rw-r--r-- | nova/compute/manager.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 556b3b3b9..923feaa59 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -77,7 +77,8 @@ flags.DEFINE_integer("rescue_timeout", 0, " Set to 0 to disable.") flags.DEFINE_bool('auto_assign_floating_ip', False, 'Autoassigning floating ip to VM') - +flags.DEFINE_integer('host_state_interval', 120, + 'Interval in seconds for querying the host status') LOG = logging.getLogger('nova.compute.manager') @@ -426,6 +427,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) |