METRON-1432 JDK Install Fails on Ubuntu Development Environment (nickwallen) closes apache/metron#913
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a285b83e Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a285b83e Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a285b83e Branch: refs/heads/feature/METRON-1344-test-infrastructure Commit: a285b83ee0153cecf24132b4aed70250040a83b0 Parents: 9be0d85 Author: nickwallen <[email protected]> Authored: Tue Jan 30 09:31:53 2018 -0500 Committer: nickallen <[email protected]> Committed: Tue Jan 30 09:31:53 2018 -0500 ---------------------------------------------------------------------- .../roles/java_jdk/tasks/install_jdk_centos.yml | 34 ++++++++++++++++++++ .../roles/java_jdk/tasks/install_jdk_ubuntu.yml | 31 ++++++++++++++++++ .../ansible/roles/java_jdk/tasks/main.yml | 22 ++++--------- 3 files changed, 71 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/a285b83e/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_centos.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_centos.yml b/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_centos.yml new file mode 100644 index 0000000..999b9c1 --- /dev/null +++ b/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_centos.yml @@ -0,0 +1,34 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +--- +- name: Check for java at "{{ java_home }}" + stat: path="{{ java_home }}" + register: jdk_dir + +- name: Alternatives link for java + alternatives: name={{ item.name }} link={{ item.link }} path={{ item.path }} + with_items: + - { name: java, link: /usr/bin/java, path: "{{ java_home }}/bin/java" } + - { name: jar, link: /usr/bin/jar, path: "{{ java_home }}/bin/jar" } + when: jdk_dir.stat.exists + +- name: Install openjdk + yum: name={{item}} + with_items: + - java-1.8.0-openjdk + - java-1.8.0-openjdk-devel + when: not jdk_dir.stat.exists http://git-wip-us.apache.org/repos/asf/metron/blob/a285b83e/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_ubuntu.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_ubuntu.yml b/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_ubuntu.yml new file mode 100644 index 0000000..8337b81 --- /dev/null +++ b/metron-deployment/ansible/roles/java_jdk/tasks/install_jdk_ubuntu.yml @@ -0,0 +1,31 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +--- +- name: Check for java at "{{ java_home }}" + stat: path="{{ java_home }}" + register: jdk_dir + +- name: Install openjdk repository + shell: add-apt-repository ppa:openjdk-r/ppa + when: not jdk_dir.stat.exists + +- name: Update package cache + apt: update_cache=yes + +- name: Install openjdk + apt: name=openjdk-8-jdk + when: not jdk_dir.stat.exists http://git-wip-us.apache.org/repos/asf/metron/blob/a285b83e/metron-deployment/ansible/roles/java_jdk/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/java_jdk/tasks/main.yml b/metron-deployment/ansible/roles/java_jdk/tasks/main.yml index 999b9c1..946da25 100644 --- a/metron-deployment/ansible/roles/java_jdk/tasks/main.yml +++ b/metron-deployment/ansible/roles/java_jdk/tasks/main.yml @@ -15,20 +15,10 @@ # limitations under the License. # --- -- name: Check for java at "{{ java_home }}" - stat: path="{{ java_home }}" - register: jdk_dir +- include: install_jdk_centos.yml + static: no + when: ansible_distribution == "CentOS" -- name: Alternatives link for java - alternatives: name={{ item.name }} link={{ item.link }} path={{ item.path }} - with_items: - - { name: java, link: /usr/bin/java, path: "{{ java_home }}/bin/java" } - - { name: jar, link: /usr/bin/jar, path: "{{ java_home }}/bin/jar" } - when: jdk_dir.stat.exists - -- name: Install openjdk - yum: name={{item}} - with_items: - - java-1.8.0-openjdk - - java-1.8.0-openjdk-devel - when: not jdk_dir.stat.exists +- include: install_jdk_ubuntu.yml + static: no + when: ansible_distribution == "Ubuntu"
