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

View File

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