node_exporter: Allow custom service name

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-node-exporter/defaults/main.yml b/ansible/roles/ceph-node-exporter/defaults/main.yml
index 8a505d51936796e538b19c11c09eea4908875023..55b7b227237e2fdaca21f5a25977f36fc957e013 100644 (file)
--- a/ansible/roles/ceph-node-exporter/defaults/main.yml
+++ b/ansible/roles/ceph-node-exporter/defaults/main.yml
@@ -9,3 +9,4 @@ defaults:
         - prometheus-node-exporter
       yum:
         - prometheus-node_exporter
+  service_name: node_exporter

diff --git a/ansible/roles/ceph-node-exporter/handlers/main.yml b/ansible/roles/ceph-node-exporter/handlers/main.yml
index bab449081d2862352a19bc33c0428ed6606cefc2..c983655a4116d4abf8907470d9d21c5b54c14820 100644 (file)
--- a/ansible/roles/ceph-node-exporter/handlers/main.yml
+++ b/ansible/roles/ceph-node-exporter/handlers/main.yml
@@ -3,7 +3,7 @@
   # We use the systemd module here so we can use the daemon_reload feature,
   # since we're shipping the .service file ourselves
   systemd:
-    name: node_exporter
+    name: "{{ node_exporter.service_name }}"
     daemon_reload: true
     enabled: true
     state: restarted

diff --git a/ansible/roles/ceph-node-exporter/tasks/create_service.yml b/ansible/roles/ceph-node-exporter/tasks/create_service.yml
index 67ef6452fa3e7542ac23d702815f848025198fc3..f3cab9d831d61358d092ab172332fe0bf74923f3 100644 (file)
--- a/ansible/roles/ceph-node-exporter/tasks/create_service.yml
+++ b/ansible/roles/ceph-node-exporter/tasks/create_service.yml
@@ -16,7 +16,7 @@
 - name: Ship defaults file
   template:
     src: sysconfig
-    dest: "/etc/{{ sysconfig_dir }}/node_exporter"
+    dest: "/etc/{{ sysconfig_dir }}/{{ node_exporter.service_name }}"
     owner: root
     group: root
     mode: 0644
@@ -24,7 +24,7 @@
 - name: Ship systemd service file
   template:
     src: node_exporter.service
-    dest: '/etc/systemd/system/'
+    dest: '/etc/systemd/system/{{ node_exporter.service_name }}.service'
     owner: root
     group: root
     mode: 0644

diff --git a/ansible/roles/ceph-node-exporter/templates/node_exporter.service b/ansible/roles/ceph-node-exporter/templates/node_exporter.service
index 87e8f58d54fcf170c9c400801d25b34dd64f1494..adfd46fbf51f8eab3dd02ac4771160fbeb4b9358 100644 (file)
--- a/ansible/roles/ceph-node-exporter/templates/node_exporter.service
+++ b/ansible/roles/ceph-node-exporter/templates/node_exporter.service
@@ -3,7 +3,7 @@ Description=Node Exporter
 
 [Service]
 User=node_exporter
-EnvironmentFile=/etc/{{ sysconfig_dir }}/node_exporter
+EnvironmentFile=/etc/{{ sysconfig_dir }}/{{ node_exporter.service_name }}
 ExecStart=/usr/local/sbin/node_exporter $OPTIONS
 
 [Install]