From 6168f16c25266326cb953cedf3ed352abe8929e2 Mon Sep 17 00:00:00 2001
From: Rodrigo Barbieri <rodrigo.barbieri@fit-tecnologia.org.br>
Date: Mon, 12 Dec 2016 09:14:57 -0200
Subject: [PATCH] Fix Manila service image config for 3rd party CIs

3rd party CIs cannot set this config by exporting an env var
or local.conf setting, as it is always being overriden in code.

Change-Id: Ia2a4790d3a0d03faa231b400c32f6c1928bdca1f
Closes-bug: #1649249
---
 contrib/ci/pre_test_hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 1b4ab48817..55b82e96ba 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -85,7 +85,7 @@ save_configuration "MANILA_DATA_COPY_CHECK_HASH" "${MANILA_DATA_COPY_CHECK_HASH:
 # Share Migration CI tests migration_continue period task interval
 save_configuration "MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL" "${MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL:=5}"
 
-MANILA_SERVICE_IMAGE_ENABLED=False
+MANILA_SERVICE_IMAGE_ENABLED=${MANILA_SERVICE_IMAGE_ENABLED:-False}
 if [[ "$DRIVER" == "generic" ]]; then
     MANILA_SERVICE_IMAGE_ENABLED=True
     save_configuration "SHARE_DRIVER" "manila.share.drivers.generic.GenericShareDriver"