openstack/openstack-ansible-ops
Code Issues Proposed changes

Use version test instead of version_compare

Browse Source 
This test was changed to 'version' in ansible 2.5 [1].

[1] https://docs.ansible.com/ansible/2.8/user_guide/playbooks_tests.html#version-comparison

Change-Id: I21efa77fc743f9530d307dc06c8a345475d35dfa
This commit is contained in:
Dmitriy Rabotyagov 2019-09-09 20:00:28 +03:00 committed by Jonathan Rosser
parent 028a25a43b
commit 3d2aed2c2d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elk_metrics_6x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
View File

@ -33,7 +33,7 @@ auditbeat.modules:
# The auditd module collects events from the audit framework in the Linux # The auditd module collects events from the audit framework in the Linux
# kernel. You need to specify audit rules for the events that you want to audit. # kernel. You need to specify audit rules for the events that you want to audit.
- module: auditd - module: auditd
{% if ansible_kernel is version_compare('4.4', '>=') %} {% if ansible_kernel is version('4.4', '>=') %}
socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }} socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }}
{% endif %} {% endif %}
resolve_ids: true resolve_ids: true

2
elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
View File

@ -33,7 +33,7 @@ auditbeat.modules:
# The auditd module collects events from the audit framework in the Linux # The auditd module collects events from the audit framework in the Linux
# kernel. You need to specify audit rules for the events that you want to audit. # kernel. You need to specify audit rules for the events that you want to audit.
- module: auditd - module: auditd
{% if ansible_kernel is version_compare('4.4', '>=') %} {% if ansible_kernel is version('4.4', '>=') %}
socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }} socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }}
{% endif %} {% endif %}
resolve_ids: true resolve_ids: true