aboutsummaryrefslogtreecommitdiffstats
path: root/scenarios
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-05-16 20:30:39 +0200
committerManuel Buil <mbuil@suse.com>2018-05-17 12:28:53 +0200
commit0b7afadb50b7b471c1fe7d93f76f7a3a92a007a5 (patch)
tree1aa5309220d74d0411635cac6e80bb16569dc222 /scenarios
parentd013255d33d28ac70c6276a81a3129c83d441740 (diff)
Bug fix: initialize ODL_VERSION6.0.1
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>
Diffstat (limited to 'scenarios')
-rw-r--r--scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml (renamed from scenarios/os-odl-nofeature/vars/main.yml)0
-rw-r--r--scenarios/os-odl-nofeature/xci_overrides5
2 files changed, 5 insertions, 0 deletions
diff --git a/scenarios/os-odl-nofeature/vars/main.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
index 629b50c..629b50c 100644
--- a/scenarios/os-odl-nofeature/vars/main.yml
+++ b/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}