Merge "Migrate to stable/newton"

3 files changed, 13 insertions, 11 deletions

diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index 4c88eeb3..dc20f6fe 100644..120000
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -1,11 +1 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  odl_version: beryllium
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
+os-odl_l3-nofeature-ha.yaml
\ No newline at end of file
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index e54f28b0..d421c7ca 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -3,6 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
+  odl_version: boron
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml
new file mode 100644
index 00000000..972b1f85
--- /dev/null
+++ b/config/deploy/os-odl_l3-nofeature-noha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false