From 7840c7594fe8e02ea504d8f6b1eb25b7ccbd9ae3 Mon Sep 17 00:00:00 2001
From: Lubos Kosco <tarzanek@gmail.com>
Date: Mon, 8 Jan 2024 17:55:29 +0100
Subject: [PATCH] scylla-node: remove ignore_errors

fix detection of legacy node-exporter services

in case old node exporter is running it will block new one from starting
so make sure old service is stopped before trying to run new one
---
 ansible-scylla-node/tasks/common.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ansible-scylla-node/tasks/common.yml b/ansible-scylla-node/tasks/common.yml
index 28ccf857..78e8dced 100644
--- a/ansible-scylla-node/tasks/common.yml
+++ b/ansible-scylla-node/tasks/common.yml
@@ -156,22 +156,30 @@
   become: true
   when: skip_ntp is defined and skip_ntp|bool == false
 
-- name: node exporter setup
+- name: check for node_exporter_install
+  stat:
+    path: /usr/sbin/node_exporter_install
+  register: node_exporter_install
+
+- name: setup legacy node exporter
   shell: |
     node_exporter_install --force
-  when: install_type == 'online'
+  when: (install_type == 'online') and (node_exporter_install.stat.exists) and ((scylla_package_prefix + '-node-exporter') not in ansible_facts.packages)
   become: true
   notify:
     - node_exporter start
-  ignore_errors: true
-  #TODO: stop ignoring errors when the node_exporter_install script fix is available in all actual versions, resp. use only for < 5.0 / 2022
 
 - name: Re-populate package facts
   package_facts:
     manager: auto
 
-- name: node exporter setup from 5.0/2022
+- name: setup bundled node exporter
   block:
+    - name: Enforce disabling of old node exporter
+      service:
+          name: node-exporter
+          state: stopped
+      when: ansible_facts.services['node-exporter.service'] is defined and (ansible_facts.services['node-exporter.service']["status"] != "not-found")
     - name: Start scylla-node-exporter service
       service:
         name: scylla-node-exporter