Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Userparameter fix for #1361 #1363

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Userparameter fix for #1361 #1363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4f6e9e
fix for #1361
Japje Aug 7, 2024
34b8280
Support include_dir being both a string and a list
Japje Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/1361_userparameters_fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- zabbix_agent Role - Fix for userparameter because include_dir is list #1361
2 changes: 1 addition & 1 deletion roles/zabbix_agent/tasks/userparameter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- name: Install user-defined userparameters
ansible.builtin.template:
src: "{{ zabbix_agent_userparameters_templates_src }}/{{ item.name }}.j2"
dest: "{{ zabbix_agent_include_dir }}/userparameter_{{ item.name }}.conf"
dest: "{{ zabbix_agent_include_dir | first }}/userparameter_{{ item.name }}.conf"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I like what you did here, I would just make one ask. Given what @AlexPykavy did in #1366 that handles both a string and a list, if you can do the same thing here so we can be consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated my PR to support this.

owner: zabbix
group: zabbix
mode: "0644"
Expand Down
Loading