diff options
-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_overrides | 5 |
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} |