From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 20 Nov 2019 23:33:01 +0000 (+0100)
Subject: Conform with latest SUT updates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F68947%2F1;p=functest.git

Conform with latest SUT updates

Ceph is now used as backend which requires few adaptations for live
migration. It differs from the main OpenStack gates but suits CNTT and
most of the feedbacks received from enduser deployments.

Change-Id: If6b76a7d4ec09f90467f3e63618c15a9b413bfbd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f6d84155526f367c73a43a83aca31af9ecdcc51a)
---

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 423a0b71f..c4d8f6f33 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -5,7 +5,7 @@ compute-feature-enabled:
     shelve: false
     vnc_console: false
     cold_migration: false
-    block_migration_for_live_migration: true
+    block_migration_for_live_migration: false
 identity:
     user_unique_last_password_count: 2
     user_lockout_duration: 10
@@ -26,7 +26,7 @@ placement:
     max_microversion: 1.30
 volume:
     max_microversion: 3.55
-    storage_protocol: iSCSI
+    storage_protocol: ceph
 volume-feature-enabled:
     multi_backend: false
     backup: true
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 85676ed57..b5a1f69ca 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -35,7 +35,7 @@ INPUTS = {
     'NAMESERVER': '8.8.8.8',
     'NEW_USER_ROLE': 'Member',
     'USE_DYNAMIC_CREDENTIALS': 'True',
-    'BLOCK_MIGRATION': 'True',
+    'BLOCK_MIGRATION': 'False',
     'CLEAN_ORPHAN_SECURITY_GROUPS': 'True',
     'SKIP_DOWN_HYPERVISORS': 'False',
     'PUBLIC_ENDPOINT_ONLY': 'False'