ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-prometheus: fix error in templates 

- remove trailing double quotes in jinja templates
- add jinja filename without .j2 suffix

Resolves: #4011

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 29b0d47c8c)
pull/4021/head
Dimitri Savineau 2019-05-21 10:29:16 -04:00 committed by Guillaume Abrioux
parent 1fd81e8d42
commit 6d521f1516
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-prometheus/tasks/main.yml
View File

@ -11,7 +11,7 @@
- name: write prometheus config file - name: write prometheus config file
template: template:
src: prometheus.yml.j2 src: prometheus.yml.j2
dest: "{{ prometheus_conf_dir }}/" dest: "{{ prometheus_conf_dir }}/prometheus.yml"
owner: "{{ prometheus_user_id }}" owner: "{{ prometheus_user_id }}"
notify: service handler notify: service handler
@ -41,7 +41,7 @@
- name: write alertmanager config file - name: write alertmanager config file
template: template:
src: alertmanager.yml.j2 src: alertmanager.yml.j2
dest: "{{ alertmanager_conf_dir }}/" dest: "{{ alertmanager_conf_dir }}/alertmanager.yml"
owner: "root" owner: "root"
notify: service handler notify: service handler

2
roles/ceph-prometheus/templates/alertmanager.service.j2
View File

@ -19,7 +19,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --name=alertmanager \
--memory-swap={{ alertmanager_container_memory * 2 }}GB \ --memory-swap={{ alertmanager_container_memory * 2 }}GB \
{{ alertmanager_container_image }} \ {{ alertmanager_container_image }} \
--config.file=/etc/alertmanager/alertmanager.yml \ --config.file=/etc/alertmanager/alertmanager.yml \
--storage.path=/alertmanager" --storage.path=/alertmanager
ExecStop=/usr/bin/{{ container_binary }} stop alertmanager ExecStop=/usr/bin/{{ container_binary }} stop alertmanager
Restart=always Restart=always
RestartSec=10s RestartSec=10s

2
roles/ceph-prometheus/templates/prometheus.service.j2
View File

@ -21,7 +21,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --name=prometheus \
{{ prometheus_container_image }} \ {{ prometheus_container_image }} \
--config.file=/etc/prometheus/prometheus.yml \ --config.file=/etc/prometheus/prometheus.yml \
--storage.tsdb.path=/prometheus \ --storage.tsdb.path=/prometheus \
--web.external-url=http://{{ inventory_hostname }}:9090/" --web.external-url=http://{{ inventory_hostname }}:9090/
ExecStop=/usr/bin/{{ container_binary }} stop prometheus ExecStop=/usr/bin/{{ container_binary }} stop prometheus
Restart=always Restart=always
RestartSec=10s RestartSec=10s