From e3862db6712692ac12bc1da5a15415756825aed2 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Wed, 30 Nov 2016 10:25:36 +0100 Subject: remove odl sdnvpn config file Change-Id: I78bbc34aff1d00b4113cfb2ebedf7e24e317a358 Signed-off-by: Nikolas Hermanns --- config/deploy/os-odl_l2-sdnvpn-ha.yaml | 10 ---------- tests/test_apex_deploy_settings.py | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 config/deploy/os-odl_l2-sdnvpn-ha.yaml diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml deleted file mode 100644 index f6904f05..00000000 --- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml +++ /dev/null @@ -1,10 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - tacker: true - congress: true - sfc: false - vpn: true diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index 2af187b2..a0af1211 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -22,7 +22,8 @@ deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', 'os-nosdn-ovs-noha.yaml', 'os-ocl-nofeature-ha.yaml', - 'os-odl_l2-sdnvpn-ha.yaml', + 'os-odl_l2-bgpvpn-ha.yaml', + 'os-odl_l2-bgpvpn-noha.yaml', 'os-odl_l3-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', 'os-nosdn-ovs-ha.yaml', -- cgit 1.2.3-korg