summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-11-11 19:26:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-11 19:26:47 +0000
commit5f2cc4e6b222d109836abd1172f481f303f46319 (patch)
tree3cf444cb9e0aead555945195d07b5f61230a90d4 /config/deploy
parent0333a22450988e3950c0915aa0cebeddf0886952 (diff)
parente8b6d6debe2b056b404fc353f54b67364b58c59d (diff)
Merge "Migrate to stable/newton"
Diffstat (limited to 'config/deploy')
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