diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-25 17:44:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-25 17:44:57 +0000 |
| commit | 474b41d07a5813c17dcb5ab77558e4bfb3153fe5 (patch) | |
| tree | 6cba3aea8f7eb27cfc532bbf25dbb7d4b0c15d4f | |
| parent | d64bbd252497593112fbd9035c8b31555d841f31 (diff) | |
| parent | d972222e50e38aa45447b57c1893678043b583aa (diff) | |
| download | nova-474b41d07a5813c17dcb5ab77558e4bfb3153fe5.tar.gz nova-474b41d07a5813c17dcb5ab77558e4bfb3153fe5.tar.xz nova-474b41d07a5813c17dcb5ab77558e4bfb3153fe5.zip | |
Merge "Use compute_driver in xenapi driver help messages."
| -rw-r--r-- | nova/virt/xenapi/driver.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 2f4059bd3..07b775fd9 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -65,23 +65,23 @@ xenapi_opts = [ cfg.StrOpt('xenapi_connection_url', default=None, help='URL for connection to XenServer/Xen Cloud Platform. ' - 'Required if connection_type=xenapi.'), + 'Required if compute_driver=xenapi.XenAPIDriver'), cfg.StrOpt('xenapi_connection_username', default='root', help='Username for connection to XenServer/Xen Cloud Platform. ' - 'Used only if connection_type=xenapi.'), + 'Used only if compute_driver=xenapi.XenAPIDriver'), cfg.StrOpt('xenapi_connection_password', default=None, help='Password for connection to XenServer/Xen Cloud Platform. ' - 'Used only if connection_type=xenapi.'), + 'Used only if compute_driver=xenapi.XenAPIDriver'), cfg.IntOpt('xenapi_connection_concurrent', default=5, help='Maximum number of concurrent XenAPI connections. ' - 'Used only if connection_type=xenapi.'), + 'Used only if compute_driver=xenapi.XenAPIDriver'), cfg.FloatOpt('xenapi_vhd_coalesce_poll_interval', default=5.0, help='The interval used for polling of coalescing vhds. ' - 'Used only if connection_type=xenapi.'), + 'Used only if compute_driver=xenapi.XenAPIDriver'), cfg.BoolOpt('xenapi_check_host', default=True, help='Ensure compute service is running on host XenAPI ' @@ -89,13 +89,14 @@ xenapi_opts = [ cfg.IntOpt('xenapi_vhd_coalesce_max_attempts', default=5, help='Max number of times to poll for VHD to coalesce. ' - 'Used only if connection_type=xenapi.'), + 'Used only if compute_driver=xenapi.XenAPIDriver'), cfg.StrOpt('xenapi_agent_path', default='usr/sbin/xe-update-networking', help='Specifies the path in which the xenapi guest agent ' 'should be located. If the agent is present, network ' 'configuration is not injected into the image. ' - 'Used if connection_type=xenapi and flat_injected=True'), + 'Used if compute_driver=xenapi.XenAPIDriver and ' + ' flat_injected=True'), cfg.StrOpt('xenapi_sr_base_path', default='/var/run/sr-mount', help='Base path to the storage repository'), @@ -140,7 +141,7 @@ class XenAPIDriver(driver.ComputeDriver): raise Exception(_('Must specify xenapi_connection_url, ' 'xenapi_connection_username (optionally), and ' 'xenapi_connection_password to use ' - 'connection_type=xenapi')) + 'compute_driver=xenapi.XenAPIDriver')) self._session = XenAPISession(url, username, password) self._volumeops = volumeops.VolumeOps(self._session) |