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