From: Manuel Buil <mbuil@suse.com>
Date: Wed, 16 May 2018 18:30:39 +0000 (+0200)
Subject: Bug fix: initialize ODL_VERSION
X-Git-Tag: 6.0.1^0
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=0b7afadb50b7b471c1fe7d93f76f7a3a92a007a5;p=releng-xci-scenarios.git

Bug fix: initialize ODL_VERSION

When doing the ansible lookup, if the variable does not exist, an empty
string is returned. That is a bug which must be fixed:

https://github.com/ansible/ansible/issues/17329

Until then, we initialize the variable

Change-Id: I92c43d15559600ff1583e1560c032377dc22793c
Signed-off-by: Manuel Buil <mbuil@suse.com>
---

diff --git a/scenarios/os-odl-nofeature/vars/main.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
similarity index 100%
rename from scenarios/os-odl-nofeature/vars/main.yml
rename to scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
diff --git a/scenarios/os-odl-nofeature/xci_overrides b/scenarios/os-odl-nofeature/xci_overrides
index 2c65df0..8d1df92 100644
--- a/scenarios/os-odl-nofeature/xci_overrides
+++ b/scenarios/os-odl-nofeature/xci_overrides
@@ -5,3 +5,8 @@ if [[ $DEPLOY_SCENARIO == "os-odl-nofeature" ]] && [[ $XCI_FLAVOR == "ha" ]]; th
 elif [[ $DEPLOY_SCENARIO == "os-odl-nofeature" ]]; then
     export VM_MEMORY_SIZE=16384
 fi
+
+# Until this feature is developed, ODL_VERSION must be initialized:
+# https://github.com/ansible/ansible/issues/17329
+# otherwise the lookup in vars/main returns an empty string when not defined
+export ODL_VERSION=${ODL_VERSION:-latest_release}