Skip to content

Commit 40c170d

Browse files
author
Jose
committed
Update Fluent version and ability to provide service template via playbook
1 parent 3f6529a commit 40c170d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

defaults/main.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
#### installation variables ####
1+
# Installation variables
22
fluentd_user: fluentd
33
fluentd_group: fluentd
4+
5+
fluentd_version: "1.2.5"
6+
47
fluentd_conf_path: "/etc/fluent"
58
fluentd_log_path: "/var/log/fluent"
69
fluentd_log_file: "{{ fluentd_log_path }}/fluent.log"
7-
fluentd_version: "0.12.40"
10+
811
fluentd_plugins: []
9-
# current state: started, stopped, restarted, reloaded
10-
fluentd_service_state: started
12+
13+
# Service variables
14+
fluentd_service_state: started # current state: started, stopped, restarted, reloaded
1115
fluentd_service_enabled: yes # yes, no
1216

17+
# Templates path
1318
fluentd_playbook_templates_path: "{{ playbook_dir }}/templates/fluentd"
19+
fluentd_service_template_path: fluentd/fluentd.service.j2

tasks/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
- name: FLUENTD | Copy fluentd service config
2929
template:
30-
src: fluentd/fluentd.service.j2
30+
src: "{{ fluentd_service_template_path }}"
3131
dest: /lib/systemd/system/fluentd.service
3232
owner: "{{ fluentd_user }}"
3333
group: "{{ fluentd_group }}"

tests/goss/specs/fluentd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ command:
6464
fluentd --version:
6565
exit-status: 0
6666
stdout:
67-
- fluentd 0.12.40
67+
- fluentd 1.2.5
6868
stderr: []
6969
timeout: 10000
7070

0 commit comments

Comments
 (0)