diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-10 23:45:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-10 23:45:50 +0000 |
| commit | 6fb05fe78555ec59ed36c4a3a1cb3f60e47c7ed3 (patch) | |
| tree | 1086ce3c910f6b7742dccdc3d029abbdbcfaf05a | |
| parent | 99c70dd3bec9d6556582aa6b6708f33ff66efdef (diff) | |
| parent | 620682ac48f3240cbc17cee0a62563bfff9b572b (diff) | |
Merge "flags documentation to deprecate connection_type"
| -rw-r--r-- | nova/compute/manager.py | 5 | ||||
| -rw-r--r-- | nova/flags.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 05818b27c..b922758f0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -86,7 +86,10 @@ compute_opts = [ "For per-compute-host cached images, set to _base_$my_ip"), cfg.StrOpt('compute_driver', default='nova.virt.connection.get_connection', - help='Driver to use for controlling virtualization'), + help='Driver to use for controlling virtualization. Options ' + 'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, ' + 'fake.FakeDriver, baremetal.BareMetalDriver, ' + 'vmwareapi.VMWareESXDriver'), cfg.StrOpt('console_host', default=socket.gethostname(), help='Console proxy host to use to connect ' diff --git a/nova/flags.py b/nova/flags.py index ec91d8260..d62a9f67e 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -76,8 +76,8 @@ def _get_my_ip(): core_opts = [ cfg.StrOpt('connection_type', default=None, - help='Virtualization api connection type : libvirt, xenapi, ' - 'or fake'), + help='Deprecated (use compute_driver instead): Virtualization ' + 'api connection type : libvirt, xenapi, or fake'), cfg.StrOpt('sql_connection', default='sqlite:///$state_path/$sqlite_db', help='The SQLAlchemy connection string used to connect to the ' |