Merge "remove odl sdnvpn config file"

diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
deleted file mode 100644 (file)
index f6904f0..0000000
--- 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 2af187b..a0af121 100644 (file)
--- 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',