Merge pull request #21 from cloudalchemy/custom_config

simplify setting custom configuration file
cloudalchemy · Dec 15, 2017 · e0aa2b2 · e0aa2b2
2 parents 8cd6678 + 16150c3
commit e0aa2b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -45,7 +45,7 @@ prometheus_targets: []
 
 prometheus_scrape_jobs: []
 
-prometheus_custom_config_path: ''
+prometheus_config_file: 'prometheus.yml.j2'
 
 prometheus_alert_rules:
 - alert: InstanceDown

diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -13,18 +13,13 @@
 
 - name: configure prometheus
   template:
-    src: "{{ item }}"
+    src: "{{ prometheus_config_file }}"
     dest: "{{ prometheus_config_dir }}/prometheus.yml"
     force: yes
     owner: prometheus
     group: prometheus
     mode: 0644
     validate: "{{ prometheus_config_validator }}"
-  with_first_found:
-    - files:
-        -  prometheus.yml.j2
-      paths:
-        - "{{ prometheus_custom_config_path }}"
   notify:
     - reload prometheus