summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/deploy/os-odl_l2-sdnvpn-ha.yaml10
-rw-r--r--tests/test_apex_deploy_settings.py3
2 files changed, 2 insertions, 11 deletions
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',