summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-02-24 01:23:00 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-24 01:23:00 +0000
commit57944a996c0e546c3726d70d55ad16912fe9fbb8 (patch)
treed701a3c14183eaf438c59d783ef8d00727871eb3 /config
parent44844d6fe06da44575ad4e9ffd59e39bbbee1df2 (diff)
parentc86bd1f24647646b7489cd72e0a0bb91f4a505f1 (diff)
Merge "Adding SDNVPN support"
Diffstat (limited to 'config')
-rw-r--r--config/deploy/deploy_settings.yaml1
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-odl_l2-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-odl_l2-sdnvpn-ha.yaml10
-rw-r--r--config/deploy/os-odl_l2-sfc-noha.yaml1
-rw-r--r--config/deploy/os-odl_l3-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-onos-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-opencontrail-nofeature-ha.yaml1
8 files changed, 17 insertions, 0 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 04101485..8292dee5 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index becd6e57..0313f9c1 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index 04101485..8292dee5 100644
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false
diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
new file mode 100644
index 00000000..73507772
--- /dev/null
+++ b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
@@ -0,0 +1,10 @@
+global_params:
+ ha_enabled: true
+
+deploy_options:
+ sdn_controller: opendaylight
+ sdn_l3: false
+ tacker: false
+ congress: false
+ sfc: false
+ vpn: true
diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
index 92372a90..6d088af8 100644
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: true
+ vpn: false
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index 84f97602..69ab5e7e 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false
diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 53912e9c..7f56fbc0 100644
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false
diff --git a/config/deploy/os-opencontrail-nofeature-ha.yaml b/config/deploy/os-opencontrail-nofeature-ha.yaml
index f6ac253b..f01a8a92 100644
--- a/config/deploy/os-opencontrail-nofeature-ha.yaml
+++ b/config/deploy/os-opencontrail-nofeature-ha.yaml
@@ -7,3 +7,4 @@ deploy_options:
tacker: false
congress: false
sfc: false
+ vpn: false