From 439eb262c8aea99f6d0a1c3c2ec6a557404ee929 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 25 Apr 2022 16:46:44 +0900
Subject: [PATCH] Remove ineffective ovn_remote_probe_interval

This parameter was introduced to puppet-neutron but it was completely
wrong and the actual parameter has never been implemented in neutron.

The interval should be configured in ovn controller, and this is
already implemented using puppet-ovn.

Depends-on: https://review.opendev.org/839157
Change-Id: I53fd5c4795b3f27c58d7731d4b6f43dc45c11092
---
 .../profile/base/neutron/ovn_metadata.pp      | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/manifests/profile/base/neutron/ovn_metadata.pp b/manifests/profile/base/neutron/ovn_metadata.pp
index 6f8c48b34..440c7802b 100644
--- a/manifests/profile/base/neutron/ovn_metadata.pp
+++ b/manifests/profile/base/neutron/ovn_metadata.pp
@@ -58,21 +58,16 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*ovn_remote_probe_interval*]
-#  (optional) Set probe interval, based on user configuration, value is in ms
-#  Defaults to 60000
-#
 class tripleo::profile::base::neutron::ovn_metadata (
-  $ovn_db_host               = hiera('ovn_dbs_vip', undef),
-  $ovn_db_node_ips           = hiera('ovn_dbs_node_ips', undef),
-  $ovn_db_clustered          = hiera('ovn_db_clustered', false),
-  $ovn_sb_port               = hiera('ovn::southbound::port'),
-  $ovn_sb_private_key        = $::os_service_default,
-  $ovn_sb_certificate        = $::os_service_default,
-  $ovn_sb_ca_cert            = $::os_service_default,
-  $protocol                  = 'tcp',
-  $step                      = Integer(hiera('step')),
-  $ovn_remote_probe_interval = 60000,
+  $ovn_db_host        = hiera('ovn_dbs_vip', undef),
+  $ovn_db_node_ips    = hiera('ovn_dbs_node_ips', undef),
+  $ovn_db_clustered   = hiera('ovn_db_clustered', false),
+  $ovn_sb_port        = hiera('ovn::southbound::port'),
+  $ovn_sb_private_key = $::os_service_default,
+  $ovn_sb_certificate = $::os_service_default,
+  $ovn_sb_ca_cert     = $::os_service_default,
+  $protocol           = 'tcp',
+  $step               = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include tripleo::profile::base::neutron
@@ -85,11 +80,10 @@ class tripleo::profile::base::neutron::ovn_metadata (
     $sb_conn = $db_hosts.map |$h| { join([$protocol, normalize_ip_for_uri($h), "${ovn_sb_port}"], ':') }
 
     class { 'neutron::agents::ovn_metadata':
-        ovn_sb_connection         => join(any2array($sb_conn), ','),
-        ovn_sb_private_key        => $ovn_sb_private_key,
-        ovn_sb_certificate        => $ovn_sb_certificate,
-        ovn_sb_ca_cert            => $ovn_sb_ca_cert,
-        ovn_remote_probe_interval => $ovn_remote_probe_interval,
+      ovn_sb_connection  => join(any2array($sb_conn), ','),
+      ovn_sb_private_key => $ovn_sb_private_key,
+      ovn_sb_certificate => $ovn_sb_certificate,
+      ovn_sb_ca_cert     => $ovn_sb_ca_cert,
     }
     Service<| title == 'controller' |> -> Service<| title == 'ovn-metadata' |>
   }