From dd4dcd1889bdbfd5952028ef9c478b6c63a8cbce Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 23 Jul 2012 17:19:32 -0400 Subject: Use compute_driver in vmware driver help messages. Updates the help messages in the vmware driver to use 'compute_driver' examples instead of 'connection_type' which is now deprecated. Change-Id: Iddea2cabc841200edd561d71f0c11fd6ba272f5d --- nova/virt/vmwareapi/driver.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'nova') diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 2b1d4cedf..112de9a93 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -54,24 +54,28 @@ vmwareapi_opts = [ cfg.StrOpt('vmwareapi_host_ip', default=None, help='URL for connection to VMWare ESX host.Required if ' - 'connection_type is vmwareapi.'), + 'compute_driver is vmwareapi.VMWareESXDriver.'), cfg.StrOpt('vmwareapi_host_username', default=None, help='Username for connection to VMWare ESX host. ' - 'Used only if connection_type is vmwareapi.'), + 'Used only if compute_driver is ' + 'vmwareapi.VMWareESXDriver.'), cfg.StrOpt('vmwareapi_host_password', default=None, help='Password for connection to VMWare ESX host. ' - 'Used only if connection_type is vmwareapi.'), + 'Used only if compute_driver is ' + 'vmwareapi.VMWareESXDriver.'), cfg.FloatOpt('vmwareapi_task_poll_interval', default=5.0, help='The interval used for polling of remote tasks. ' - 'Used only if connection_type is vmwareapi'), + 'Used only if compute_driver is ' + 'vmwareapi.VMWareESXDriver.'), cfg.IntOpt('vmwareapi_api_retry_count', default=10, help='The number of times we retry on failures, e.g., ' 'socket error, etc. ' - 'Used only if connection_type is vmwareapi'), + 'Used only if compute_driver is ' + 'vmwareapi.VMWareESXDriver.'), cfg.StrOpt('vmwareapi_vlan_interface', default='vmnic0', help='Physical ethernet adapter name for vlan networking'), @@ -107,7 +111,7 @@ class VMWareESXDriver(driver.ComputeDriver): raise Exception(_("Must specify vmwareapi_host_ip," "vmwareapi_host_username " "and vmwareapi_host_password to use" - "connection_type=vmwareapi")) + "compute_driver=vmwareapi.VMWareESXDriver")) session = VMWareAPISession(host_ip, host_username, host_password, api_retry_count, scheme=scheme) -- cgit