summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-05-20 20:25:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-20 20:25:18 +0000
commit967243a0bb93972820eecafdfb2c925b5fe81420 (patch)
treee254df089109ac166aae16affaad33dcc1476d34
parentd15f7639b32faf16e4bf9010e7a5f2aa86ff4e03 (diff)
parent3aa3187c75417b51941bf4e9e898fbe5a8805c22 (diff)
Merge "Adds nosdn-noha scenario and fixes opencontrail scenario naming"
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml10
-rw-r--r--config/deploy/os-ocl-nofeature-ha.yaml (renamed from config/deploy/os-opencontrail-nofeature-ha.yaml)0
2 files changed, 10 insertions, 0 deletions
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
new file mode 100644
index 00000000..9bda3e8e
--- /dev/null
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -0,0 +1,10 @@
+global_params:
+ ha_enabled: false
+
+deploy_options:
+ sdn_controller: false
+ sdn_l3: false
+ tacker: false
+ congress: false
+ sfc: false
+ vpn: false
diff --git a/config/deploy/os-opencontrail-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index f01a8a92..f01a8a92 100644
--- a/config/deploy/os-opencontrail-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml