From 0b7afadb50b7b471c1fe7d93f76f7a3a92a007a5 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 16 May 2018 20:30:39 +0200 Subject: 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 --- scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml | 2 ++ scenarios/os-odl-nofeature/vars/main.yml | 2 -- scenarios/os-odl-nofeature/xci_overrides | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml delete mode 100644 scenarios/os-odl-nofeature/vars/main.yml (limited to 'scenarios') diff --git a/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml new file mode 100644 index 0000000..629b50c --- /dev/null +++ b/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml @@ -0,0 +1,2 @@ +--- +odl_repo_version: "{{ lookup('env','ODL_VERSION') }}" diff --git a/scenarios/os-odl-nofeature/vars/main.yml b/scenarios/os-odl-nofeature/vars/main.yml deleted file mode 100644 index 629b50c..0000000 --- a/scenarios/os-odl-nofeature/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -odl_repo_version: "{{ lookup('env','ODL_VERSION') }}" 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} -- cgit 1.2.3-korg