commit 7f4104a96fa84ac56c28d858836075e91943caab
author Jenkins <jenkins@review.openstack.org> Wed Nov 19 23:40:31 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 19 23:40:31 2014 +0000
tree bc15eb6253a70cb1739e366d922c161e57257312
parent 08f4f3a5a8aab745bf6b6a751a9c823db1874168
parent 31a139adb9058f6cf4c6427abc28477eadbed7f6

Merge "Attempt to test live_migration by default"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index d5311a9..b04d0bb 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -429,7 +429,7 @@
 
 # Does the test environment support live migration available? (boolean
 # value)
-#live_migration = false
+#live_migration = true
 
 # Does the test environment support pausing? (boolean value)
 #pause = true

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 163817c..495de62 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -312,7 +312,7 @@
                 default=True,
                 help="Does the test environment support suspend/resume?"),
     cfg.BoolOpt('live_migration',
-                default=False,
+                default=True,
                 help="Does the test environment support live migration "
                      "available?"),
     cfg.BoolOpt('block_migration_for_live_migration',