From 25fb879478bf205d174b131e8932ed1c17b0347e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 29 Oct 2024 10:16:02 +0900 Subject: [PATCH] ovn: Disable inactivity probe in CentOS In CentOS we run neutron api by httpd + mod_wsgi and this deployment pattern causes occasional disconnection between neutron and onv which results in test failure. Disable inactivity probe to avoid the disconnection to stabilize the CI job. Change-Id: Ic39a41e98b97e7f6f5b2c7065545297b71937190 --- manifests/ovn.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/ovn.pp b/manifests/ovn.pp index 2a105ee56..05fa931b7 100644 --- a/manifests/ovn.pp +++ b/manifests/ovn.pp @@ -54,6 +54,10 @@ class openstack_integration::ovn( $ovn_controller_ssl_ca_cert = undef } + $inactivity_probe = $facts['os']['family'] ? { + 'RedHat' => 0, + default => 60000, + } class { 'ovn::northd': dbs_listen_ip => $::openstack_integration::config::ip_for_url, ovn_nb_db_ssl_key => $ovn_nb_db_ssl_key, @@ -62,8 +66,8 @@ class openstack_integration::ovn( ovn_sb_db_ssl_key => $ovn_sb_db_ssl_key, ovn_sb_db_ssl_cert => $ovn_sb_db_ssl_cert, ovn_sb_db_ssl_ca_cert => $ovn_sb_db_ssl_ca_cert, - ovn_nb_db_inactivity_probe => 120000, - ovn_sb_db_inactivity_probe => 120000, + ovn_nb_db_inactivity_probe => $inactivity_probe, + ovn_sb_db_inactivity_probe => $inactivity_probe, } class { 'ovn::controller': ovn_remote => $::openstack_integration::config::ovn_sb_connection,