From 8da46bb8dc9a634dd7b56657c52581dfe8168a41 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 20 Sep 2018 13:39:56 +0200
Subject: Allow overriding default storage protocol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It adds a new env var STORAGE_PROTOCOL to override storage_protocol
in tempest. The default value is unchanged [1].

[1] https://docs.openstack.org/tempest/latest/sampleconf.html

Co-Authored-By: Viktor Tikkanen <viktor.tikkanen@nokia.com>

Change-Id: I19e4e25212b6f6176e3b967e01eb634c15e4d474
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit a561c6ca316feb1a203327aa729ac0317f70df48)
---
 ci/globals.yaml | 1 +
 ci/run.yaml     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'ci')

diff --git a/ci/globals.yaml b/ci/globals.yaml
index 47a1a8972..7b307c8a7 100644
--- a/ci/globals.yaml
+++ b/ci/globals.yaml
@@ -10,3 +10,4 @@
     prefix: '/home/opnfv/functest'
     nameserver: '8.8.8.8'
     external_network: 'ext-net'
+    storage_protocol: 'iSCSI'
diff --git a/ci/run.yaml b/ci/run.yaml
index 385d38fb1..c7e27eccc 100644
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -7,6 +7,7 @@
           docker run \
             -e NAMESERVER={nameserver} \
             -e EXTERNAL_NETWORK={external_network} \
+            -e STORAGE_PROTOCOL={storage_protocol} \
             -v \
             {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \
             -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \
-- 
cgit 1.2.3-korg