From: Zack Cerza <zack@redhat.com>
Date: Thu, 7 Jun 2018 22:40:24 +0000 (-0600)
Subject: node_exporter: Allow custom service name
X-Git-Tag: v2.0~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F191%2Fhead;p=cephmetrics.git

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 8a505d5..55b7b22 100644
--- 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 bab4490..c983655 100644
--- 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 67ef645..f3cab9d 100644
--- 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 87e8f58..adfd46f 100644
--- 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]