Merge "Update description of Enable block_migrate_cinder_iscsi"

This commit is contained in:
Jenkins 2015-03-30 02:41:43 +00:00 committed by Gerrit Code Review
commit f2902eaa6e
2 changed files with 4 additions and 2 deletions

@ -395,7 +395,8 @@
#block_migration_for_live_migration = false
# Does the test environment block migration support cinder iSCSI
# volumes (boolean value)
# volumes. Note, libvirt doesn't support this, see
# https://bugs.launchpad.net/nova/+bug/1398999 (boolean value)
#block_migrate_cinder_iscsi = false
# Enable VNC console. This configuration value should be same as

@ -327,7 +327,8 @@ ComputeFeaturesGroup = [
cfg.BoolOpt('block_migrate_cinder_iscsi',
default=False,
help="Does the test environment block migration support "
"cinder iSCSI volumes"),
"cinder iSCSI volumes. Note, libvirt doesn't support this, "
"see https://bugs.launchpad.net/nova/+bug/1398999"),
cfg.BoolOpt('vnc_console',
default=False,
help='Enable VNC console. This configuration value should '