diff options
| -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 | ||||
| -rw-r--r-- | sfc/lib/cleanup.py | 2 |
3 files changed, 8 insertions, 1 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..ecbff0ee 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:-latest_release} diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py index ca802da3..9ee16c6e 100644 --- a/sfc/lib/cleanup.py +++ b/sfc/lib/cleanup.py @@ -19,7 +19,7 @@ def delete_odl_resources(odl_ip, odl_port, resource): def delete_odl_ietf_access_lists(odl_ip, odl_port): acl_list = odl_utils.get_odl_acl_list(odl_ip, odl_port) acl_types_names = odl_utils.odl_acl_types_names(acl_list) - for acl_type, acl_name in acl_types_names: + for acl_type, acl_name in acl_types_names.iteritems(): odl_utils.delete_odl_acl(odl_ip, odl_port, acl_type, acl_name) |