From 9e1e823d2e921f9ecba600f4ef828e24b7446d43 Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Fri, 18 Dec 2015 18:19:37 +0100
Subject: [PATCH] Adding service BGPVPN

This commit adds vpn features to odl if BGPVPN
is used.

Change-Id: I496190a8538dd9738eb397281fa9062a329225fb
---
 .../puppet/modules/opendaylight/manifests/service.pp        | 4 ++++
 environment_config.yaml                                     | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/service.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/service.pp
index 20d863f..c3b1904 100644
--- a/deployment_scripts/puppet/modules/opendaylight/manifests/service.pp
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/service.pp
@@ -52,6 +52,10 @@ class opendaylight::service (
       $enable['gbp'] = $features['gbp']
     }
 
+    if hiera('bgpvpn', false) {
+      $enable['vpn'] = $features['vpn']
+    }
+
     file { '/opt/opendaylight/etc/org.apache.karaf.features.cfg':
       ensure  => file,
       owner   => 'odl',
diff --git a/environment_config.yaml b/environment_config.yaml
index f3ae470..5729392 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -42,6 +42,12 @@ attributes:
         - odl-sfc-ovs
         - odl-sfcofl2
         - odl-sfc-test-consumer
+      vpn:
+        - odl-vpnservice-api
+        - odl-vpnservice-impl
+        - odl-vpnservice-impl-rest
+        - odl-vpnservice-impl-ui
+        - odl-vpnservice-core
   rest_api_port:
     value: '8282'
     label: 'Port number'