Skip to content

Commit 9568459

Browse files
geerlingguygeerlingguy
committed
Attempt to fix ansible_facts deprecation warnings.
1 parent 462ea8d commit 9568459

8 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎molecule/default/converge.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
set_fact:
99
java_packages:
1010
- java-1.8.0-openjdk
11-
when: ansible_os_family == "RedHat"
11+
when: ansible_facts.os_family == "RedHat"
1212

1313
- name: Set Java 8 package for Ubuntu.
1414
set_fact:
1515
java_packages:
1616
- openjdk-8-jdk
17-
when: ansible_os_family == "Ubuntu"
17+
when: ansible_facts.os_family == "Ubuntu"
1818

1919
- name: Set Java 11 package for Debian.
2020
set_fact:
2121
java_packages:
2222
- openjdk-11-jdk
23-
when: ansible_os_family == "Debian"
23+
when: ansible_facts.os_family == "Debian"
2424

2525
- name: Update apt cache.
2626
apt: update_cache=true cache_valid_time=600
27-
when: ansible_os_family == "Debian"
27+
when: ansible_facts.os_family == "Debian"
2828

2929
# See: http://unix.stackexchange.com/a/342469
3030
- name: Install dependencies (Debian).
@@ -33,7 +33,7 @@
3333
- openjdk-11-jre-headless
3434
- ca-certificates-java
3535
state: present
36-
when: ansible_distribution == "Debian"
36+
when: ansible_facts.distribution == "Debian"
3737

3838
roles:
3939
- role: geerlingguy.java

‎molecule/default/solr-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
pre_tasks:
1010
- name: Update apt cache.
1111
apt: update_cache=true cache_valid_time=600
12-
when: ansible_os_family == "Debian"
12+
when: ansible_facts.os_family == "Debian"
1313

1414
roles:
1515
- role: geerlingguy.java

‎molecule/default/solr-4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
pre_tasks:
1111
- name: Update apt cache.
1212
apt: update_cache=true cache_valid_time=600
13-
when: ansible_os_family == "Debian"
13+
when: ansible_facts.os_family == "Debian"
1414

1515
roles:
1616
- role: geerlingguy.java

‎molecule/default/solr-5.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
pre_tasks:
1313
- name: Update apt cache.
1414
apt: update_cache=true cache_valid_time=600
15-
when: ansible_os_family == "Debian"
15+
when: ansible_facts.os_family == "Debian"
1616

1717
roles:
1818
- role: geerlingguy.java

‎molecule/default/solr-6.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
set_fact:
1212
java_packages:
1313
- java-1.8.0-openjdk
14-
when: ansible_os_family == "RedHat"
14+
when: ansible_facts.os_family == "RedHat"
1515

1616
- name: Set Java 8 package for Ubuntu.
1717
set_fact:
1818
java_packages:
1919
- openjdk-8-jdk
20-
when: ansible_distribution == "Ubuntu"
20+
when: ansible_facts.distribution == "Ubuntu"
2121

2222
- name: Set Java 11 package for Debian.
2323
set_fact:
2424
java_packages:
2525
- openjdk-11-jdk
26-
when: ansible_distribution == "Debian"
26+
when: ansible_facts.distribution == "Debian"
2727

2828
- name: Update apt cache.
2929
apt: update_cache=true cache_valid_time=600
30-
when: ansible_os_family == "Debian"
30+
when: ansible_facts.os_family == "Debian"
3131

3232
# See: http://unix.stackexchange.com/a/342469
3333
- name: Install dependencies (Debian).
@@ -36,7 +36,7 @@
3636
- openjdk-11-jre-headless
3737
- ca-certificates-java
3838
state: present
39-
when: ansible_distribution == "Debian"
39+
when: ansible_facts.distribution == "Debian"
4040

4141
roles:
4242
- role: geerlingguy.java

‎molecule/default/solr-7.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
set_fact:
1212
java_packages:
1313
- java-1.8.0-openjdk
14-
when: ansible_os_family == "RedHat"
14+
when: ansible_facts.os_family == "RedHat"
1515

1616
- name: Set Java 8 package for Ubuntu.
1717
set_fact:
1818
java_packages:
1919
- openjdk-8-jdk
20-
when: ansible_distribution == "Ubuntu"
20+
when: ansible_facts.distribution == "Ubuntu"
2121

2222
- name: Set Java 11 package for Debian.
2323
set_fact:
2424
java_packages:
2525
- openjdk-11-jdk
26-
when: ansible_distribution == "Debian"
26+
when: ansible_facts.distribution == "Debian"
2727

2828
- name: Update apt cache.
2929
apt: update_cache=true cache_valid_time=600
30-
when: ansible_os_family == "Debian"
30+
when: ansible_facts.os_family == "Debian"
3131

3232
# See: http://unix.stackexchange.com/a/342469
3333
- name: Install dependencies (Debian).
@@ -36,7 +36,7 @@
3636
- openjdk-11-jre-headless
3737
- ca-certificates-java
3838
state: present
39-
when: ansible_distribution == "Debian"
39+
when: ansible_facts.distribution == "Debian"
4040

4141
roles:
4242
- role: geerlingguy.java

‎tasks/install-pre5.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@
5959
group: root
6060
mode: 0664
6161
changed_when: false
62-
when: ansible_service_mgr != 'systemd'
62+
when: ansible_facts.service_mgr != 'systemd'
6363

6464
- name: Copy solr init script into place.
6565
template:
66-
src: "solr-init-{{ ansible_os_family }}-pre5.j2"
66+
src: "solr-init-{{ ansible_facts.os_family }}-pre5.j2"
6767
dest: "/etc/init.d/{{ solr_service_name }}"
6868
mode: 0755
69-
when: ansible_service_mgr != 'systemd'
69+
when: ansible_facts.service_mgr != 'systemd'
7070

7171
- name: Ensure daemon is installed (Debian).
7272
apt: name=daemon state=present
7373
when:
74-
- ansible_os_family == "Debian"
75-
- ansible_service_mgr != 'systemd'
74+
- ansible_facts.os_family == "Debian"
75+
- ansible_facts.service_mgr != 'systemd'
7676

7777
- name: Copy solr systemd unit file into place (for systemd systems).
7878
template:
@@ -81,4 +81,4 @@
8181
owner: root
8282
group: root
8383
mode: 0755
84-
when: ansible_service_mgr == 'systemd'
84+
when: ansible_facts.service_mgr == 'systemd'

‎tasks/install.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
- chkconfig
1515
state: present
1616
when:
17-
- ansible_service_mgr == 'systemd'
18-
- ansible_os_family == 'RedHat'
19-
- ansible_distribution_version.split(".")[0] >= '9'
17+
- ansible_facts.service_mgr == 'systemd'
18+
- ansible_facts.os_family == 'RedHat'
19+
- ansible_facts.distribution_version.split(".")[0] >= '9'
2020

2121
- name: Ensure service wrapper is installed for RHEL 7 & 8.
2222
package:
@@ -25,17 +25,17 @@
2525
- chkconfig
2626
state: present
2727
when:
28-
- ansible_service_mgr == 'systemd'
29-
- ansible_os_family == 'RedHat'
30-
- ansible_distribution_version.split(".")[0] <= '8'
28+
- ansible_facts.service_mgr == 'systemd'
29+
- ansible_facts.os_family == 'RedHat'
30+
- ansible_facts.distribution_version.split(".")[0] <= '8'
3131

3232
- name: Ensure service wrapper is installed for Debian-based distributions.
3333
package:
3434
name: init-system-helpers
3535
state: present
3636
when:
37-
- ansible_service_mgr == 'systemd'
38-
- ansible_os_family == 'Debian'
37+
- ansible_facts.service_mgr == 'systemd'
38+
- ansible_facts.os_family == 'Debian'
3939

4040
# We add '-n' to Solr versions beyond 6.3.0 to prevent autostart on install.
4141
- name: Run Solr installation script.
@@ -56,8 +56,8 @@
5656
- name: Ensure solr is stopped (RHEL 7+ workaround).
5757
command: service {{ solr_service_name }} stop
5858
when:
59-
- ansible_os_family == 'RedHat'
60-
- ansible_distribution_version.split(".")[0] >= '7'
59+
- ansible_facts.os_family == 'RedHat'
60+
- ansible_facts.distribution_version.split(".")[0] >= '7'
6161
- solr_install_script_result.changed
6262
failed_when: false
6363
tags: ['skip_ansible_lint']
@@ -67,7 +67,7 @@
6767
name: solr
6868
daemon_reload: true
6969
when:
70-
- ansible_os_family == 'RedHat'
71-
- ansible_distribution_version.split(".")[0] >= '7'
70+
- ansible_facts.os_family == 'RedHat'
71+
- ansible_facts.distribution_version.split(".")[0] >= '7'
7272
- solr_install_script_result.changed
7373
tags: ['skip_ansible_lint']

0 commit comments

Comments
 (0)