From 620682ac48f3240cbc17cee0a62563bfff9b572b Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 6 Jul 2012 11:11:06 -0400 Subject: flags documentation to deprecate connection_type connection_type in nova.conf is deprecated for Folsom, provide additional documentation in the flags to indicate this, and the new compute_driver options Part of bp:virt-driver-cleanup Change has DocImpact for Folsom Change-Id: Iaff658771b1e992304454368e66ee53f9a0480ff --- nova/compute/manager.py | 5 ++++- nova/flags.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 10fc0277d..4c7f1931d 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 cff3b46ae..7b46b7463 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 ' -- cgit