diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-05-10 07:57:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-10 07:57:54 +0000 |
| commit | 19e1907a59b4096be7edca7ccdbcf02252004325 (patch) | |
| tree | 431125882ffbc60afb315070977c7d33b8d00274 | |
| parent | 5f8eb6bf01ca3ef240cfcdee297327b21b33f35a (diff) | |
| parent | eecc16dfe618800f469d058f60377cefede821f9 (diff) | |
Merge "Lookup ODL_VERSION variable"
| -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} |