From dbf81b6b5bd6d7e977706a93f9e75b38efe32305 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 11 Jun 2019 09:35:28 -0400 Subject: [PATCH] ceph-node-exporter: use modprobe ansible module Instead of using the modprobe command from the path in the systemd unit script, we can use the modprobe ansible module. That way we don't have to manage the binary path based on the linux distribution. Resolves: #4072 Signed-off-by: Dimitri Savineau --- roles/ceph-node-exporter/tasks/setup_container.yml | 5 +++++ roles/ceph-node-exporter/templates/node_exporter.service.j2 | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/ceph-node-exporter/tasks/setup_container.yml b/roles/ceph-node-exporter/tasks/setup_container.yml index 2dd4dd100..add7d1d7b 100644 --- a/roles/ceph-node-exporter/tasks/setup_container.yml +++ b/roles/ceph-node-exporter/tasks/setup_container.yml @@ -7,6 +7,11 @@ group: root mode: 0644 +- name: add the cfg80211 module + modprobe: + name: cfg80211 + state: present + - name: start the node_exporter service systemd: name: node_exporter diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2 index 1f5dd7150..caad8baa9 100644 --- a/roles/ceph-node-exporter/templates/node_exporter.service.j2 +++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2 @@ -18,9 +18,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --name=node-exporter \ --path.procfs=/host/proc \ --path.sysfs=/host/sys \ --no-collector.timex \ -# Make sure the cfg80211 is loaded before running the container, the node -# exporter needs this module loaded to test for presence of wi-fi devices -ExecStartPre=/usr/sbin/modprobe cfg80211 ExecStop=-/usr/bin/{{ container_binary }} stop node-exporter Restart=always RestartSec=10s