build/patches/puppet-neutron-add-external_network_bridge-option.patch

   1 From 48a73ebfd382158b900c041952689128390d14f3 Mon Sep 17 00:00:00 2001
   2 From: Feng Pan <fpan@redhat.com>
   3 Date: Sat, 30 Sep 2017 01:02:27 -0400
   4 Subject: [PATCH] Add external_network_bridge config back
   5
   6 Change-Id: I67582e2033eb1f849f7e76148f089a7f815d1f78
   7 ---
   8  manifests/agents/l3.pp                                     | 13 +++++++++++++
   9  manifests/agents/vpnaas.pp                                 | 14 ++++++++++++++
  10  ...d_external_network_bridge-options-613a8793ef13d761.yaml |  3 ---
  11  3 files changed, 27 insertions(+), 3 deletions(-)
  12  delete mode 100644 releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml
  13
  14 diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
  15 index 651c7508..df25e3e3 100644
  16 --- a/manifests/agents/l3.pp
  17 +++ b/manifests/agents/l3.pp
  18 @@ -92,6 +92,12 @@
  19  #   (optional) L3 agent extensions to enable.
  20  #   Defaults to $::os_service_default
  21  #
  22 +# === Deprecated Parameters
  23 +#
  24 +# [*external_network_bridge*]
  25 +#   (optional) Deprecated. The name of the external bridge
  26 +#   Defaults to $::os_service_default
  27 +#
  28  class neutron::agents::l3 (
  29    $package_ensure                   = 'present',
  30    $enabled                          = true,
  31 @@ -113,11 +119,17 @@ class neutron::agents::l3 (
  32    $purge_config                     = false,
  33    $availability_zone                = $::os_service_default,
  34    $extensions                       = $::os_service_default,
  35 +  # DEPRECATED PARAMETERS
  36 +  $external_network_bridge          = $::os_service_default,
  37  ) {
  38
  39    include ::neutron::deps
  40    include ::neutron::params
  41
  42 +  if ! is_service_default ($external_network_bridge) {
  43 +    warning('parameter external_network_bridge is deprecated')
  44 +  }
  45 +
  46    resources { 'neutron_l3_agent_config':
  47      purge => $purge_config,
  48    }
  49 @@ -132,6 +144,7 @@ class neutron::agents::l3 (
  50
  51    neutron_l3_agent_config {
  52      'DEFAULT/debug':                            value => $debug;
  53 +    'DEFAULT/external_network_bridge':          value => $external_network_bridge;
  54      'DEFAULT/interface_driver':                 value => $interface_driver;
  55      'DEFAULT/gateway_external_network_id':      value => $gateway_external_network_id;
  56      'DEFAULT/handle_internal_only_routers':     value => $handle_internal_only_routers;
  57 diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
  58 index 52eb4026..1bab10e7 100644
  59 --- a/manifests/agents/vpnaas.pp
  60 +++ b/manifests/agents/vpnaas.pp
  61 @@ -45,12 +45,18 @@
  62  #   in the vpnaas config.
  63  #   Defaults to false.
  64  #
  65 +# === Deprecated Parameters
  66 +#
  67 +# [*external_network_bridge*]
  68 +#  (optional) Deprecated. Defaults to $::os_service_default
  69 +#
  70  class neutron::agents::vpnaas (
  71    $package_ensure              = present,
  72    $enabled                     = true,
  73    $manage_service              = true,
  74    $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
  75    $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
  76 +  $external_network_bridge     = $::os_service_default,
  77    $ipsec_status_check_interval = $::os_service_default,
  78    $purge_config                = false,
  79  ) {
  80 @@ -97,6 +103,14 @@ class neutron::agents::vpnaas (
  81      'DEFAULT/interface_driver':          value => $interface_driver;
  82    }
  83
  84 +  if ! is_service_default ($external_network_bridge) {
  85 +    warning('parameter external_network_bridge is deprecated')
  86 +  }
  87 +
  88 +  neutron_vpnaas_agent_config {
  89 +    'DEFAULT/external_network_bridge': value => $external_network_bridge;
  90 +  }
  91 +
  92    if $::neutron::params::vpnaas_agent_package {
  93      ensure_resource( 'package', 'neutron-vpnaas-agent', {
  94        'ensure' => $package_ensure,
  95 diff --git a/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml b/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml
  96 deleted file mode 100644
  97 index 10464012..00000000
  98 --- a/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml
  99 +++ /dev/null
 100 @@ -1,3 +0,0 @@
 101 ----
 102 -deprecations:
 103 -  - Removed deprecated option external_network_bridge.
 104 --
 105 2.13.4
 106