From 7c4946b20e6bca9ac080c80156edab8f9e753ccf Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Fri, 16 Oct 2015 17:51:01 +0200 Subject: [PATCH 1/8] Adding RedHat support. --- tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index d621013..fca07c5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,3 +1,5 @@ --- - include: Debian.yml when: ansible_os_family == 'Debian' +- include: RedHat.yml + when: ansible_os_family == 'RedHat' From da71dff2c0289f364325fe8618a712044f0c7b9b Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Fri, 16 Oct 2015 18:05:15 +0200 Subject: [PATCH 2/8] Adding RedHat support. --- tasks/Debian.yml | 2 +- tasks/RedHat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/Debian.yml b/tasks/Debian.yml index 241c9b6..91dbb89 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -21,7 +21,7 @@ - name: Install Java packages apt: pkg={{ item }} state=latest - with_items: java_packages + with_items: debian_java_packages - name: Remove unwanted Java packages apt: pkg={{ item }} state=absent diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 64cda39..17222f1 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -2,7 +2,7 @@ - name: Install Java packages yum: name={{ item }} state=latest - with_items: java_packages + with_items: redhat_java_packages when: ansible_os_family == 'RedHat' From 3757814e2020eb44495cd436f7d53e2f7d99cfd8 Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Fri, 16 Oct 2015 19:12:00 +0200 Subject: [PATCH 3/8] Adding RedHat support. --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 52e4258..ab233d2 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,17 @@ None. Role Variables -------------- -The `java_packages` variable must be set to a list of the desired Java packages. For example: +There are two variable for the Debian and RedHat/Fedora based distributions. See +below for examples: ```yaml -java_packages: - - openjdk-6-jdk - - oracle-java7-installer +debian_java_packages: + - oracle-java8-installer +``` + +```yaml +redhat_java_packages: + - java-1.8.0-openjdk-devel ``` # Debian / Ubuntu @@ -46,6 +51,7 @@ Valid packages for Fedora are: - java-1.7.0-openjdk - java-1.8.0-openjdk +- java-1.8.0-openjdk-devel # Others From b7c841564b96b44629915e1598ea52945cee5929 Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Mon, 19 Oct 2015 11:05:56 +0200 Subject: [PATCH 4/8] Fixing unit tests. --- tests/group_vars/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/group_vars/test b/tests/group_vars/test index bb328d6..a25c8b2 100644 --- a/tests/group_vars/test +++ b/tests/group_vars/test @@ -1,5 +1,5 @@ --- -java_packages: +debian_java_packages: - oracle-java8-set-default - oracle-java8-installer - openjdk-6-jdk From d97b712956b88c9ad416dd5e9d7195d03e57ad04 Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Mon, 19 Oct 2015 16:07:36 +0200 Subject: [PATCH 5/8] Fixing unit tests. --- vars/Ubuntu.yml | 2 +- vars/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml index d024844..0ff427d 100644 --- a/vars/Ubuntu.yml +++ b/vars/Ubuntu.yml @@ -19,4 +19,4 @@ java_packages_full: #- openjdk-7-jre-headless:i386 #- openjdk-7-jre-zero #- openjdk-7-jre-zero:i386 -java_packages_to_remove: "{{ java_packages_full | difference(java_packages) }}" +java_packages_to_remove: "{{ java_packages_full | difference(debian_java_packages) }}" diff --git a/vars/main.yml b/vars/main.yml index 87515b8..1a7bead 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,2 @@ --- -java_needs_oracle: "{{ java_packages | join | search('oracle') }}" +java_needs_oracle: "{{ debian_java_packages | join | search('oracle') }}" From 5e00294ae7189103f6c863aee13e7947faf3be66 Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Mon, 19 Oct 2015 17:19:28 +0200 Subject: [PATCH 6/8] Fixing unit tests. --- defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 92a6125..af7a11a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,4 @@ --- -java_packages: [] +debian_java_packages: [] +redhat_java_packages: [] java_cleanup: True From eadd3956368d2e521c01227c480db615ec5316be Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Wed, 20 Apr 2016 10:41:55 +0200 Subject: [PATCH 7/8] Using dnf. --- tasks/RedHat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 17222f1..1a5bdf1 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,7 +1,7 @@ --- - name: Install Java packages - yum: name={{ item }} state=latest + dnf: name={{ item }} state=latest with_items: redhat_java_packages when: ansible_os_family == 'RedHat' From 082ddc5fce9f3ddac8976e178f83d12145a60e24 Mon Sep 17 00:00:00 2001 From: Nathan Sowatskey Date: Wed, 20 Apr 2016 19:43:48 +0200 Subject: [PATCH 8/8] Back to yum. --- tasks/RedHat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 1a5bdf1..17222f1 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,7 +1,7 @@ --- - name: Install Java packages - dnf: name={{ item }} state=latest + yum: name={{ item }} state=latest with_items: redhat_java_packages when: ansible_os_family == 'RedHat'