Merge "Remove thirdparty-requirements.txt in smoke"

[functest.git] / functest / opnfv_tests / openstack / tempest / conf_utils.py

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 72ea5ce..7f7db35 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -115,17 +115,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id):
                         'for-deployment-{}'.format(deployment_id))
 
 
-def get_repo_tag(repo):
-    """
-    Returns last tag of current branch
-    """
-    cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo))
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
-    tag = p.stdout.readline().rstrip()
-
-    return str(tag)
-
-
 def backup_tempest_config(conf_file):
     """
     Copy config file to tempest results directory
@@ -227,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():