build/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch

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