From 5825886fc15fa27791df98f0f5ba685d6206fb0c Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sun, 30 Oct 2016 00:01:24 +0800
Subject: [PATCH] Remove libvirt migration flags options

The 'live_migration_flag' and 'block_migration_flag' options in libvirt
section that were deprecated in Mitaka have been completely removed in
Newton, because nova automatically sets correct migration flags.

Change-Id: Ia4bbbe3d0e46467b0d5f0a495528471dbf340b01
---
 manifests/migration/libvirt.pp                | 21 -------------------
 ...gration_flags_option-49813a67ef23d781.yaml |  5 +++++
 2 files changed, 5 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/remove_libvirt_migration_flags_option-49813a67ef23d781.yaml

diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp
index b3777bf1a..1bde64508 100644
--- a/manifests/migration/libvirt.pp
+++ b/manifests/migration/libvirt.pp
@@ -49,16 +49,6 @@
 #   (optional) Whether or not configure libvirt bits.
 #   Defaults to true.
 #
-#DEPRECATED PARAMETERS
-#
-# [*live_migration_flag*]
-#   (optional) Migration flags to be set for live migration (string value)
-#   Defaults to undef
-#
-# [*block_migration_flag*]
-#   (optional) Migration flags to be set for block migration (string value)
-#   Defaults to undef
-#
 class nova::migration::libvirt(
   $use_tls                           = false,
   $auth                              = 'none',
@@ -68,9 +58,6 @@ class nova::migration::libvirt(
   $override_uuid                     = false,
   $configure_libvirt                 = true,
   $configure_nova                    = true,
-  #DEPRECATED PARAMETERS
-  $live_migration_flag               = undef,
-  $block_migration_flag              = undef,
 ){
 
   include ::nova::deps
@@ -85,14 +72,6 @@ class nova::migration::libvirt(
     $listen_tcp = '1'
   }
 
-  if $live_migration_flag {
-    warning('live_migration_flag parameter is deprecated, has no effect and will be removed in a future release.')
-  }
-
-  if $block_migration_flag {
-    warning('block_migration_flag parameter is deprecated, has no effect and will be removed in a future release.')
-  }
-
   if $configure_nova {
     if $use_tls {
       nova_config {
diff --git a/releasenotes/notes/remove_libvirt_migration_flags_option-49813a67ef23d781.yaml b/releasenotes/notes/remove_libvirt_migration_flags_option-49813a67ef23d781.yaml
new file mode 100644
index 000000000..8d9c305a3
--- /dev/null
+++ b/releasenotes/notes/remove_libvirt_migration_flags_option-49813a67ef23d781.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - The 'live_migration_flag' and 'block_migration_flag' options in libvirt
+    section that were deprecated in Mitaka have been completely removed in
+    Newton.