Skip to content

fix(ansible/tasks): update ansible_facts syntax for compatibility #155

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

Open
ricardoleal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ansible/tasks): update ansible_facts syntax for compatibility #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ For RHEL / CentOS:
- hosts: server
roles:
- role: geerlingguy.java
when: "ansible_facts.os_family == 'RedHat'"
when: "ansible_facts['os_family'] == 'RedHat'"
java_packages:
- java-1.8.0-openjdk

Expand All @@ -50,11 +50,11 @@ For Ubuntu < 16.04:
tasks:
- name: installing repo for Java 8 in Ubuntu
apt_repository: repo='ppa:openjdk-r/ppa'

- hosts: server
roles:
- role: geerlingguy.java
when: "ansible_facts.os_family == 'Debian'"
when: "ansible_facts['os_family'] == 'Debian'"
java_packages:
- openjdk-8-jdk

Expand Down
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
apt:
update_cache: true
cache_valid_time: 600
when: ansible_facts.os_family == 'Debian'
when: ansible_facts['os_family'] == 'Debian'
changed_when: false

roles:
Expand Down
28 changes: 14 additions & 14 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
- name: Include OS-specific variables for Fedora or FreeBSD.
include_vars: "{{ ansible_facts.distribution }}.yml"
when: ansible_facts.distribution == 'FreeBSD' or ansible_facts.distribution == 'Fedora'
include_vars: "{{ ansible_facts['distribution'] }}.yml"
when: ansible_facts['distribution'] == 'FreeBSD' or ansible_facts['distribution'] == 'Fedora'

- name: Include OS-specific variables for Amazon.
include_vars: "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version}}.yml"
when: ansible_facts.distribution == 'Amazon'
include_vars: "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version']}}.yml"
when: ansible_facts['distribution'] == 'Amazon'

- name: Include version-specific variables for CentOS/RHEL.
include_vars: "RedHat-{{ ansible_facts.distribution_version.split('.')[0] }}.yml"
include_vars: "RedHat-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
when: >-
ansible_facts.distribution in [
ansible_facts['distribution'] in [
'CentOS',
'Red Hat Enterprise Linux',
'RedHat',
Expand All @@ -20,12 +20,12 @@
]

- name: Include version-specific variables for Ubuntu.
include_vars: "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version.split('.')[0] }}.yml"
when: ansible_facts.distribution == 'Ubuntu'
include_vars: "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
when: ansible_facts['distribution'] == 'Ubuntu'

- name: Include version-specific variables for Debian.
include_vars: "{{ ansible_facts.distribution | title }}-{{ ansible_facts.distribution_version.split('.')[0] }}.yml"
when: ansible_facts.os_family == 'Debian'
include_vars: "{{ ansible_facts['distribution'] | title }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
when: ansible_facts['os_family'] == 'Debian'

- name: Define java_packages.
set_fact:
Expand All @@ -34,16 +34,16 @@

# Setup/install tasks.
- include_tasks: setup-RedHat.yml
when: ansible_facts.os_family == 'RedHat'
when: ansible_facts['os_family'] == 'RedHat'

- include_tasks: setup-Amazon.yml
when: ansible_facts.distribution == 'Amazon'
when: ansible_facts['distribution'] == 'Amazon'

- include_tasks: setup-Debian.yml
when: ansible_facts.os_family == 'Debian'
when: ansible_facts['os_family'] == 'Debian'

- include_tasks: setup-FreeBSD.yml
when: ansible_facts.os_family == 'FreeBSD'
when: ansible_facts['os_family'] == 'FreeBSD'

# Environment setup.
- name: Set JAVA_HOME if configured.
Expand Down
6 changes: 3 additions & 3 deletions tasks/setup-Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 and
# https://github.com/geerlingguy/ansible-role-java/issues/64
- name: Ensure 'man' directory exists.
file: # noqa 208
file: # noqa 208
path: /usr/share/man/man1
state: directory
mode: 0755
when:
- ansible_facts.distribution == 'Ubuntu'
- ansible_facts.distribution_major_version | int >= 18
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_major_version'] | int >= 18

- name: Ensure Java is installed.
apt:
Expand Down
Loading