1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From 8676df91883d52e53f2762107267e106ce8c1c64 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Fri, 16 Mar 2018 08:47:30 -0400
Subject: [PATCH] Add vpp ml2 type_driver config
Change-Id: I60fb724f2a61377f65df7608c4d70f534c5539f5
Signed-off-by: Feng Pan <fpan@redhat.com>
---
manifests/agents/ml2/vpp.pp | 14 +++++++++++++-
manifests/plugins/ml2/vpp.pp | 6 ++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/manifests/agents/ml2/vpp.pp b/manifests/agents/ml2/vpp.pp
index f8204024..ca3a333b 100644
--- a/manifests/agents/ml2/vpp.pp
+++ b/manifests/agents/ml2/vpp.pp
@@ -42,6 +42,15 @@
# in the vpp config.
# Defaults to false.
#
+# [*type_drivers*]
+# (optional) List of network type driver entrypoints to be loaded
+# Could be an array that can contain flat, vlan or vxlan
+# Defaults to $::os_service_default.
+#
+# [*service_plugins*]
+# (optional) service plugins config
+# Defaults to $::os_service_default.
+#
class neutron::agents::ml2::vpp (
$package_ensure = 'present',
$enabled = true,
@@ -51,6 +60,8 @@ class neutron::agents::ml2::vpp (
$etcd_port = $::os_service_default,
$etcd_user = $::os_service_default,
$etcd_pass = $::os_service_default,
+ $type_drivers = $::os_service_default,
+ $service_plugins = $::os_service_default,
$purge_config = false,
) {
include ::neutron::deps
@@ -66,7 +77,8 @@ class neutron::agents::ml2::vpp (
'ml2_vpp/etcd_port': value => $etcd_port;
'ml2_vpp/etcd_user': value => $etcd_user;
'ml2_vpp/etcd_pass': value => $etcd_pass;
- 'DEFAULT/host': value => $::hostname;
+ 'ml2/type_drivers': value => join(any2array($type_drivers), ',');
+ 'DEFAULT/service_plugins': value => $service_plugins;
}
package { 'neutron-vpp-agent':
diff --git a/manifests/plugins/ml2/vpp.pp b/manifests/plugins/ml2/vpp.pp
index 0410a43e..b0c3c4d8 100644
--- a/manifests/plugins/ml2/vpp.pp
+++ b/manifests/plugins/ml2/vpp.pp
@@ -20,11 +20,16 @@
# (optional) Password for etcd authentication
# Defaults to $::os_service_default.
#
+# [*l3_hosts*]
+# (optional) L3 vpp-routing hosts
+# Defaults to $::os_service_default.
+#
class neutron::plugins::ml2::vpp (
$etcd_host = $::os_service_default,
$etcd_port = $::os_service_default,
$etcd_user = $::os_service_default,
$etcd_pass = $::os_service_default,
+ $l3_hosts = $::os_service_default,
) {
include ::neutron::deps
require ::neutron::plugins::ml2
@@ -34,5 +39,6 @@ class neutron::plugins::ml2::vpp (
'ml2_vpp/etcd_port': value => $etcd_port;
'ml2_vpp/etcd_user': value => $etcd_user;
'ml2_vpp/etcd_pass': value => $etcd_pass, secret => true;
+ 'ml2_vpp/l3_hosts': value => $l3_hosts;
}
}
--
2.14.3
|
