From 8a8b706e69d7b26b798f6c8983d58de9b7d5a1fa Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@cisco.com>
Date: Thu, 3 Apr 2014 15:18:48 -0400
Subject: [PATCH] Include interface driver for vpn agent

Fix to include interface driver in the vpn_agent.ini
config file. Defaults to ovs interface driver.

Change-Id: I1b57817b79627878eac6fcb4cedaad835bdf98c1
Closes-Bug: #1301418
---
 manifests/agents/vpnaas.pp                 | 5 +++++
 spec/classes/neutron_agents_vpnaas_spec.rb | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
index 7ea261c88..338f1f4a6 100644
--- a/manifests/agents/vpnaas.pp
+++ b/manifests/agents/vpnaas.pp
@@ -34,6 +34,9 @@
 # [*vpn_device_driver*]
 #   (optional) Defaults to 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver'.
 #
+# [*interface_driver*]
+#  (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
+#
 # [*ipsec_status_check_interval*]
 #   (optional) Status check interval. Defaults to '60'.
 #
@@ -42,6 +45,7 @@
   $enabled                     = true,
   $manage_service              = true,
   $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
+  $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
   $ipsec_status_check_interval = '60'
 ) {
 
@@ -69,6 +73,7 @@
   neutron_vpnaas_agent_config {
     'vpnagent/vpn_device_driver':        value => $vpn_device_driver;
     'ipsec/ipsec_status_check_interval': value => $ipsec_status_check_interval;
+    'DEFAULT/interface_driver':          value => $interface_driver;
   }
 
   if $::neutron::params::vpnaas_agent_package {
diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb
index bf5399abc..2d0277a6c 100644
--- a/spec/classes/neutron_agents_vpnaas_spec.rb
+++ b/spec/classes/neutron_agents_vpnaas_spec.rb
@@ -34,6 +34,7 @@
     { :package_ensure              => 'present',
       :enabled                     => true,
       :vpn_device_driver           => 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
+      :interface_driver            => 'neutron.agent.linux.interface.OVSInterfaceDriver',
       :ipsec_status_check_interval => '60'
     }
   end
@@ -51,6 +52,7 @@
     it 'configures vpnaas_agent.ini' do
       should contain_neutron_vpnaas_agent_config('vpnagent/vpn_device_driver').with_value(p[:vpn_device_driver]);
       should contain_neutron_vpnaas_agent_config('ipsec/ipsec_status_check_interval').with_value(p[:ipsec_status_check_interval]);
+      should contain_neutron_vpnaas_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
     end
 
     it 'installs neutron vpnaas agent package' do