diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-22 17:20:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-22 17:20:24 +0000 |
| commit | 60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2 (patch) | |
| tree | 9d308826cc31ce037f6ac5d1a223c915e7a6572c /plugins | |
| parent | f300018b1a731a9e427e6b77a05376d78fa8f9ec (diff) | |
| parent | 424de7eea2588a3f4143e5874aac01d0dd1917e6 (diff) | |
| download | nova-60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2.tar.gz nova-60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2.tar.xz nova-60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2.zip | |
Merge "blueprint host-aggregates: improvements and clean-up"
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost index 9a7ad84af..8fcf9fee0 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost @@ -117,9 +117,9 @@ def _resume_compute(session, compute_ref, compute_uuid): logging.exception('Waited %d seconds for the slave to ' 'become available.' % (c * DEFAULT_SLEEP)) time.sleep(DEFAULT_SLEEP) - raise pluginlib.PluginError('Unrecoverable error: the host has ' - 'not come back for more than %d seconds' - % (DEFAULT_SLEEP * (DEFAULT_TRIES + 1))) + raise pluginlib.PluginError('Unrecoverable error: the host has ' + 'not come back for more than %d seconds' + % (DEFAULT_SLEEP * (DEFAULT_TRIES + 1))) def _get_host_uuid(): @@ -315,7 +315,7 @@ def host_data(self, arg_dict): """Runs the commands on the xenstore host to return the current status information. """ - host_uuid = _get_host_uuid() + host_uuid = arg_dict.get('host_uuid', _get_host_uuid()) cmd = "xe host-param-list uuid=%s" % host_uuid resp = _run_command(cmd) parsed_data = parse_response(resp) |