Skip to content

Commit

Permalink
Update version tests to use Ansible 2.5+ syntax (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
dudefellah authored May 8, 2020
1 parent 4c74564 commit 7735623
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ wildfly_dir: "{{ wildfly_install_dir }}/{{ wildfly_name }}"
wildfly_dir_mode: '0750'
wildfly_create_symlink: true

wildfly_init_src_path: "{{ 'docs/contrib/scripts' if wildfly_major_v | version_compare('10', '>=') else 'bin' }}"
wildfly_init_src_path: "{{ 'docs/contrib/scripts' if wildfly_major_v is version('10', '>=') else 'bin' }}"

wildfly_log_dir: "/var/log/wildfly"
wildfly_console_log_dir: "{{ wildfly_log_dir }}"
Expand Down
4 changes: 2 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ galaxy_info:
author: Juan Diego Romero González
description: Installs Wildfly's application runtime
license: BSD
min_ansible_version: 2.2
min_ansible_version: 2.5
platforms:
- name: EL
versions:
- 6
- 7
categories:
galaxy_tags:
- development
- web
dependencies: []
2 changes: 1 addition & 1 deletion tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
permanent: yes
immediate: yes
state: enabled
when: ansible_distribution_version|version_compare(7, '=') and wildfly_manage_firewall
when: ansible_distribution_major_version is version('7', '=') and wildfly_manage_firewall

- meta: flush_handlers

Expand Down

0 comments on commit 7735623

Please sign in to comment.