From 52fee2fbb820c538bca221085dc2e24da76fab11 Mon Sep 17 00:00:00 2001 From: "younes.ouadi" Date: Fri, 9 Feb 2018 19:37:45 +0000 Subject: [PATCH 1/2] elasticsearch: add condition to whether or not install java. --- ansible-role-elasticsearch/defaults/main.yml | 1 + ansible-role-elasticsearch/tasks/Debian.yml | 20 ++++++++------- ansible-role-elasticsearch/tasks/RedHat.yml | 26 +++++++++++--------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/ansible-role-elasticsearch/defaults/main.yml b/ansible-role-elasticsearch/defaults/main.yml index 23f1b76d..b7de910b 100644 --- a/ansible-role-elasticsearch/defaults/main.yml +++ b/ansible-role-elasticsearch/defaults/main.yml @@ -7,3 +7,4 @@ elasticsearch_jvm_xms: null elastic_stack_version: 6.1.2 elasticsearch_shards: 5 elasticsearch_replicas: 1 +elasticsearch_install_java: yes diff --git a/ansible-role-elasticsearch/tasks/Debian.yml b/ansible-role-elasticsearch/tasks/Debian.yml index c0f1603b..d6e3a7e1 100644 --- a/ansible-role-elasticsearch/tasks/Debian.yml +++ b/ansible-role-elasticsearch/tasks/Debian.yml @@ -10,16 +10,18 @@ repo: 'ppa:webupd8team/java' codename: 'xenial' -- name: Debian/Ubuntu | Accept Oracle Java 8 license - debconf: - name: oracle-java8-installer - question: shared/accepted-oracle-license-v1-1 - value: true - vtype: boolean +- when: elasticsearch_install_java + block: + - name: Debian/Ubuntu | Accept Oracle Java 8 license + debconf: + name: oracle-java8-installer + question: shared/accepted-oracle-license-v1-1 + value: true + vtype: boolean -- name: Debian/Ubuntu | Oracle Java 8 installer - apt: name=oracle-java8-installer state=present update_cache=yes - tags: install + - name: Debian/Ubuntu | Oracle Java 8 installer + apt: name=oracle-java8-installer state=present update_cache=yes + tags: install - name: Debian/Ubuntu | Add Elasticsearch GPG key. apt_key: diff --git a/ansible-role-elasticsearch/tasks/RedHat.yml b/ansible-role-elasticsearch/tasks/RedHat.yml index 35e5b74e..75aa7c52 100644 --- a/ansible-role-elasticsearch/tasks/RedHat.yml +++ b/ansible-role-elasticsearch/tasks/RedHat.yml @@ -1,16 +1,18 @@ --- -- name: RedHat/CentOS/Fedora | download Oracle Java RPM - get_url: - url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm - dest: /tmp/jdk-8-linux-x64.rpm - headers: 'Cookie:oraclelicense=accept-securebackup-cookie' - register: oracle_java_task_rpm_download +- when: elasticsearch_install_java + block: + - name: RedHat/CentOS/Fedora | download Oracle Java RPM + get_url: + url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm + dest: /tmp/jdk-8-linux-x64.rpm + headers: 'Cookie:oraclelicense=accept-securebackup-cookie' + register: oracle_java_task_rpm_download -- name: RedHat/CentOS/Fedora | Install Oracle Java RPM - package: name=/tmp/jdk-8-linux-x64.rpm state=present - when: oracle_java_task_rpm_download is defined - register: oracle_java_task_rpm_installed - tags: install + - name: RedHat/CentOS/Fedora | Install Oracle Java RPM + package: name=/tmp/jdk-8-linux-x64.rpm state=present + when: oracle_java_task_rpm_download is defined + register: oracle_java_task_rpm_installed + tags: install - name: RedHat/CentOS/Fedora | Install Elastic repo yum_repository: @@ -22,5 +24,5 @@ - name: RedHat/CentOS/Fedora | Install Elasticsarch package: name=elasticsearch-{{ elastic_stack_version }} state=present - when: oracle_java_task_rpm_installed is defined + when: not elasticsearch_install_java or oracle_java_task_rpm_installed is defined tags: install From f8c0170ea275661f1a4494e51288f5ac8a9abe59 Mon Sep 17 00:00:00 2001 From: "younes.ouadi" Date: Fri, 9 Feb 2018 19:39:43 +0000 Subject: [PATCH 2/2] logstash: add condition to whether or not install java. --- ansible-role-logstash/defaults/main.yml | 2 ++ ansible-role-logstash/tasks/Debian.yml | 26 +++++++++++++------------ ansible-role-logstash/tasks/RedHat.yml | 26 +++++++++++++------------ 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/ansible-role-logstash/defaults/main.yml b/ansible-role-logstash/defaults/main.yml index 248a851c..155c9f31 100644 --- a/ansible-role-logstash/defaults/main.yml +++ b/ansible-role-logstash/defaults/main.yml @@ -12,3 +12,5 @@ logstash_ssl: false logstash_ssl_dir: /etc/pki/logstash logstash_ssl_certificate_file: "" logstash_ssl_key_file: "" + +logstash_install_java: yes diff --git a/ansible-role-logstash/tasks/Debian.yml b/ansible-role-logstash/tasks/Debian.yml index 3820a764..afaf50e3 100644 --- a/ansible-role-logstash/tasks/Debian.yml +++ b/ansible-role-logstash/tasks/Debian.yml @@ -10,19 +10,21 @@ repo: 'ppa:webupd8team/java' codename: 'xenial' -- name: Debian/Ubuntu | Accept Oracle Java 8 license - debconf: - name: oracle-java8-installer - question: shared/accepted-oracle-license-v1-1 - value: true - vtype: boolean +- when: logstash_install_java + block: + - name: Debian/Ubuntu | Accept Oracle Java 8 license + debconf: + name: oracle-java8-installer + question: shared/accepted-oracle-license-v1-1 + value: true + vtype: boolean -- name: Debian/Ubuntu | Oracle Java 8 installer - apt: - name: oracle-java8-installer - update_cache: yes - state: present - tags: install + - name: Debian/Ubuntu | Oracle Java 8 installer + apt: + name: oracle-java8-installer + update_cache: yes + state: present + tags: install - name: Debian/Ubuntu | Add Elasticsearch GPG key apt_key: diff --git a/ansible-role-logstash/tasks/RedHat.yml b/ansible-role-logstash/tasks/RedHat.yml index e9e8dc32..a9ca6fe4 100644 --- a/ansible-role-logstash/tasks/RedHat.yml +++ b/ansible-role-logstash/tasks/RedHat.yml @@ -1,16 +1,18 @@ --- -- name: RedHat/CentOS/Fedora | download Oracle Java RPM - get_url: - url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm - dest: /tmp/jdk-8-linux-x64.rpm - headers: 'Cookie:oraclelicense=accept-securebackup-cookie' - register: oracle_java_task_rpm_download +- when: logstash_install_java + block: + - name: RedHat/CentOS/Fedora | download Oracle Java RPM + get_url: + url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm + dest: /tmp/jdk-8-linux-x64.rpm + headers: 'Cookie:oraclelicense=accept-securebackup-cookie' + register: oracle_java_task_rpm_download -- name: RedHat/CentOS/Fedora | Install Oracle Java RPM - package: name=/tmp/jdk-8-linux-x64.rpm state=present - when: oracle_java_task_rpm_download is defined - register: oracle_java_task_rpm_installed - tags: install + - name: RedHat/CentOS/Fedora | Install Oracle Java RPM + package: name=/tmp/jdk-8-linux-x64.rpm state=present + when: oracle_java_task_rpm_download is defined + register: oracle_java_task_rpm_installed + tags: install - name: RedHat/CentOS/Fedora | Install Logstash repo yum_repository: @@ -22,7 +24,7 @@ - name: RedHat/CentOS/Fedora | Install Logstash package: name=logstash-{{ elastic_stack_version }} state=present - when: oracle_java_task_rpm_installed is defined + when: not logstash_install_java or oracle_java_task_rpm_installed is defined tags: install - name: RedHat/CentOS/Fedora | Checking if wazuh-manager is installed