Merge "flags documentation to deprecate connection_type"
This commit is contained in:
commit
6fb05fe785
@ -86,7 +86,10 @@ compute_opts = [
|
|||||||
"For per-compute-host cached images, set to _base_$my_ip"),
|
"For per-compute-host cached images, set to _base_$my_ip"),
|
||||||
cfg.StrOpt('compute_driver',
|
cfg.StrOpt('compute_driver',
|
||||||
default='nova.virt.connection.get_connection',
|
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',
|
cfg.StrOpt('console_host',
|
||||||
default=socket.gethostname(),
|
default=socket.gethostname(),
|
||||||
help='Console proxy host to use to connect '
|
help='Console proxy host to use to connect '
|
||||||
|
@ -76,8 +76,8 @@ def _get_my_ip():
|
|||||||
core_opts = [
|
core_opts = [
|
||||||
cfg.StrOpt('connection_type',
|
cfg.StrOpt('connection_type',
|
||||||
default=None,
|
default=None,
|
||||||
help='Virtualization api connection type : libvirt, xenapi, '
|
help='Deprecated (use compute_driver instead): Virtualization '
|
||||||
'or fake'),
|
'api connection type : libvirt, xenapi, or fake'),
|
||||||
cfg.StrOpt('sql_connection',
|
cfg.StrOpt('sql_connection',
|
||||||
default='sqlite:///$state_path/$sqlite_db',
|
default='sqlite:///$state_path/$sqlite_db',
|
||||||
help='The SQLAlchemy connection string used to connect to the '
|
help='The SQLAlchemy connection string used to connect to the '
|
||||||
|
Loading…
Reference in New Issue
Block a user