diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index a2ee0b3dbb3c..66fb23b6c5f0 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -164,12 +164,24 @@ libvirt_opts = [ cfg.StrOpt('live_migration_flag', default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, ' 'VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED', - help='Migration flags to be set for live migration'), + help='Migration flags to be set for live migration', + deprecated_for_removal=True, + deprecated_reason='The correct live migration flags can be ' + 'inferred from the new ' + 'live_migration_tunnelled config option. ' + 'live_migration_flag will be removed to ' + 'avoid potential misconfiguration.'), cfg.StrOpt('block_migration_flag', default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, ' 'VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED, ' 'VIR_MIGRATE_NON_SHARED_INC', - help='Migration flags to be set for block migration'), + help='Migration flags to be set for block migration', + deprecated_for_removal=True, + deprecated_reason='The correct block migration flags can be ' + 'inferred from the new ' + 'live_migration_tunnelled config option. ' + 'block_migration_flag will be removed to ' + 'avoid potential misconfiguration.'), cfg.BoolOpt('live_migration_tunnelled', help='Whether to use tunnelled migration, where migration ' 'data is transported over the libvirtd connection. If ' diff --git a/releasenotes/notes/libvirt-deprecate-migration-flags-config-4ba1e2d6c9ef09ff.yaml b/releasenotes/notes/libvirt-deprecate-migration-flags-config-4ba1e2d6c9ef09ff.yaml new file mode 100644 index 000000000000..e09ca517b669 --- /dev/null +++ b/releasenotes/notes/libvirt-deprecate-migration-flags-config-4ba1e2d6c9ef09ff.yaml @@ -0,0 +1,9 @@ +--- +deprecations: + - | + The libvirt live_migration_flag and block_migration_flag + config options are deprecated. These options gave too + fine grained control over the flags used and, in some + cases, misconfigurations could have dangerous side + effects. Please note the availability of a new + live_migration_tunnelled configuration option.