From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 1 May 2019 07:35:23 +0000 (+0000)
Subject: Merge "Manage block_migration_for_live_migration"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=16ffbff2c72591d16e2baac12eadc3f66969d54d;hp=-c;p=releng.git

Merge "Manage block_migration_for_live_migration"
---

16ffbff2c72591d16e2baac12eadc3f66969d54d
diff --combined jjb/functest/functest-alpine.sh
index 2162bf828,e314e6274..4f3c9ef98
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -105,8 -105,7 +105,8 @@@ test -f ${HOME}/opnfv/functest/custom/p
  envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
      -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
      -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \
 -    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}"
 +    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL} \
 +    -e DEBUG=true"
  
  ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
  
@@@ -157,6 -156,7 +157,7 @@@ apex
  compute-feature-enabled:
      shelve: false
      vnc_console: true
+     block_migration_for_live_migration: false
  identity-feature-enabled:
      api_v2: false
      api_v2_admin: false
@@@ -177,6 -177,7 +178,7 @@@ compass
  compute-feature-enabled:
      shelve: false
      vnc_console: false
+     block_migration_for_live_migration: false
      spice_console: true
  identity-feature-enabled:
      api_v2: false