summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-10-10 17:11:20 -0400
committerTim Rozet <trozet@redhat.com>2016-11-11 10:43:32 -0500
commite8b6d6debe2b056b404fc353f54b67364b58c59d (patch)
tree759d2a9c2794c6cbc223c251e30520c3d573a4c5 /config
parent4e2424a3802fc541a9b21ad53981b4725ed70320 (diff)
Migrate to stable/newton
os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config')
l---------[-rw-r--r--]config/deploy/os-odl_l2-nofeature-ha.yaml12
-rw-r--r--config/deploy/os-odl_l3-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-odl_l3-nofeature-noha.yaml11
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