aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-11 07:31:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 07:31:34 +0000
commit7a759b0b687d66af60dc03955e33ea0f125193a4 (patch)
tree2a9838e2154774e42427d1125bc685a4c57f3709
parente654fdc083aba6fdc6e3e81cceefea4b21933d45 (diff)
parentaa650b632046fbb27ec183ac4263b9163ecf136d (diff)
Merge "Allow live migration related tests to run"
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py2
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 2042b2d15..64382ded8 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -179,7 +179,7 @@ class RallyBase(testcase.OSGCTestCase):
@staticmethod
def live_migration_supported():
- """Determine is live migration is supported."""
+ """Determine if live migration is supported."""
config = iniparse.ConfigParser()
if (config.read(RallyBase.TEMPEST_CONF_FILE) and
config.has_section('compute-feature-enabled') and
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 4202df625..7f7db35eb 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -216,6 +216,7 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None,
if compute_cnt > 1:
# enable multinode tests
config.set('compute', 'min_compute_nodes', compute_cnt)
+ config.set('compute-feature-enabled', 'live_migration', True)
config.set('identity', 'region', 'RegionOne')
if os_utils.is_keystone_v3():