1 From 8e37e0fae6195ec177828a9e9d36c6ee009cd372 Mon Sep 17 00:00:00 2001
2 From: Feng Pan <fpan@redhat.com>
3 Date: Thu, 18 May 2017 17:39:42 -0400
4 Subject: [PATCH] Add ml2 type_drivers setting
6 Change-Id: Ie47a1ace6302d7eccd3ead676c4e1cde7e82c5d2
8 manifests/agents/ml2/vpp.pp | 10 ++++++++--
9 1 file changed, 8 insertions(+), 2 deletions(-)
11 diff --git a/manifests/agents/ml2/vpp.pp b/manifests/agents/ml2/vpp.pp
12 index f17d67e8..08427833 100644
13 --- a/manifests/agents/ml2/vpp.pp
14 +++ b/manifests/agents/ml2/vpp.pp
20 +# (optional) List of network type driver entrypoints to be loaded
21 +# Could be an array that can contain flat, vlan or vxlan
22 +# Defaults to $::os_service_default.
24 class neutron::agents::ml2::vpp (
25 $package_ensure = 'present',
27 @@ -51,6 +56,7 @@ class neutron::agents::ml2::vpp (
28 $etcd_port = $::os_service_default,
29 $etcd_user = $::os_service_default,
30 $etcd_pass = $::os_service_default,
31 + $type_drivers = $::os_service_default,
32 $purge_config = false,
34 include ::neutron::deps
35 @@ -61,12 +67,12 @@ class neutron::agents::ml2::vpp (
39 - 'ml2_vpp/physnets': value => $physnets;
40 + 'ml2_vpp/physnets': value => $physnets;
41 'ml2_vpp/etcd_host': value => $etcd_host;
42 'ml2_vpp/etcd_port': value => $etcd_port;
43 'ml2_vpp/etcd_user': value => $etcd_user;
44 'ml2_vpp/etcd_pass': value => $etcd_pass;
45 - 'DEFAULT/host': value => $::hostname;
46 + 'ml2/type_drivers': value => join(any2array($type_drivers), ',');
49 package { 'neutron-vpp-agent':