diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-04-17 11:04:32 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-05-08 08:33:42 +0000 |
| commit | eecc16dfe618800f469d058f60377cefede821f9 (patch) | |
| tree | e067b99c4957bcdee8eb5adc1778df58a6a798b5 | |
| parent | 93e61b0ab4a09c3f4af626489127b02603dc84a7 (diff) | |
Lookup ODL_VERSION variable
We require that variable to select different ODL versions
Change-Id: I37aca357a7a5e0772529dac70ec8ee81b52f3cf8
Signed-off-by: Manuel Buil <mbuil@suse.com>
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/vars/main.yml | 2 | ||||
| -rw-r--r-- | scenarios/os-odl-sfc/xci_overrides | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/vars/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/vars/main.yml new file mode 100644 index 00000000..629b50c7 --- /dev/null +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/vars/main.yml @@ -0,0 +1,2 @@ +--- +odl_repo_version: "{{ lookup('env','ODL_VERSION') }}" diff --git a/scenarios/os-odl-sfc/xci_overrides b/scenarios/os-odl-sfc/xci_overrides index 0f8f7436..74cba615 100644 --- a/scenarios/os-odl-sfc/xci_overrides +++ b/scenarios/os-odl-sfc/xci_overrides @@ -3,3 +3,8 @@ if [[ $XCI_FLAVOR == "ha" ]]; then else export VM_MEMORY_SIZE=16384 fi + +# Until this feature is developed, ODL_VERSION must be intialized: +# 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:-oxygen} |