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
mr10.5.1
Guillem Jover 4 years ago
parent e36b805bdd
commit f5daf62367

@ -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' %]

@ -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 -%]

@ -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"]

Loading…
Cancel
Save