From f5daf62367a374171b48d19d44f934f1a0983678 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 28 Apr 2022 16:06:44 +0200 Subject: [PATCH] TT#174750 Switch obsolete heartbeat-2 support to always disabled Starting with mr10.5, the heartbeat-2 support is now obsolete and not available anymore. Switch all heartbeat-2 service and process checks to expect them to be disabled. Remove the UDP check, as we have now removed the RPC port start limitation, so we might end up checking for an unrelated colliding port. Change-Id: Ibacaf2d55e45b3f86a5218b92204d180e934e1e2 --- templates/411_process-ngcp-pro.yaml.tt2 | 4 ++-- templates/510_init-daemons-ngcp.yaml.tt2 | 8 ++++---- templates/822_network-ports-ngcp-pro.yaml.tt2 | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/templates/411_process-ngcp-pro.yaml.tt2 b/templates/411_process-ngcp-pro.yaml.tt2 index 6a3b45b..f63fe38 100644 --- a/templates/411_process-ngcp-pro.yaml.tt2 +++ b/templates/411_process-ngcp-pro.yaml.tt2 @@ -14,10 +14,10 @@ process: # We have to use a truncated process name because that's the COMM limit # on Linux (15 characters). Real name: ngcp-hb-watchdog. ngcp-hb-watchdo: - running: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' && heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %] + running: false heartbeat: - running: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' ? 'true' : 'false' %] + running: false corosync: running: [% ha.gcs == 'corosync' ? 'true' : 'false' %] diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 1097eaf..758a6e1 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -32,8 +32,8 @@ service: running: [% is_lb && haproxy.enable == "yes" && general.ngcp_type == 'carrier' ? 'true' : 'false' %] ngcp-hb-watchdog.service: - enabled: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' && heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %] - running: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' && heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %] + enabled: false + running: false kamailio-lb.service: enabled: [% general.process_handler == 'none' && kamailio.lb.start == "yes" ? 'true' : 'false' %] @@ -151,7 +151,7 @@ service: [% IF general.ngcp_type != 'spce' -%] heartbeat.service: - enabled: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' ? 'true' : 'false' %] - running: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' ? 'true' : 'false' %] + enabled: false + running: false [% END -%] diff --git a/templates/822_network-ports-ngcp-pro.yaml.tt2 b/templates/822_network-ports-ngcp-pro.yaml.tt2 index f209dd4..dc86c7c 100644 --- a/templates/822_network-ports-ngcp-pro.yaml.tt2 +++ b/templates/822_network-ports-ngcp-pro.yaml.tt2 @@ -27,8 +27,3 @@ port: udp:5405: listening: [% ha.gcs == 'corosync' ? 'true' : 'false' %] ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] - - # Heartbeat - udp:[% heartbeat.port ? heartbeat.port : '694' %]: - listening: [% ha.gcs == 'heartbeat-2' || ha.crm == 'heartbeat-2' ? 'true' : 'false' %] - ip: ["0.0.0.0"]