From 7fa6dae5d14881ec4d9e443d2682e601045393bf Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 7 Jun 2018 16:40:24 -0600 Subject: [PATCH] node_exporter: Allow custom service name Signed-off-by: Zack Cerza --- ansible/roles/ceph-node-exporter/defaults/main.yml | 1 + ansible/roles/ceph-node-exporter/handlers/main.yml | 2 +- ansible/roles/ceph-node-exporter/tasks/create_service.yml | 4 ++-- .../roles/ceph-node-exporter/templates/node_exporter.service | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) 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] -- 2.47.3