openstack
/
nova
Code Issues Proposed changes

Merge "flags documentation to deprecate connection_type"

This commit is contained in:
Jenkins 2012-07-10 23:45:50 +00:00 committed by Gerrit Code Review
parent 99c70dd3be 620682ac48
commit 6fb05fe785
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/compute/manager.py
View File

@ -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 '

4
nova/flags.py
View File

@ -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 '