From 9e5f2dff6f263108e74cb932f89d964752e88569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Sun, 21 May 2017 11:13:48 +0200 Subject: [PATCH] Break dependencies and use include_role --- elastic-sources-list/tasks/main.yml | 1 + elasticsearch/meta/main.yml | 4 +--- elasticsearch/tasks/packages.yml | 9 ++++++++- filebeat/meta/main.yml | 22 +++++++++++++++++++--- filebeat/tasks/main.yml | 5 ++++- java8/meta/main.yml | 3 --- java8/tasks/main.yml | 7 +++++++ kibana/meta/main.yml | 22 +++++++++++++++++++--- kibana/tasks/main.yml | 9 ++++++++- logstash/meta/main.yml | 23 +++++++++++++++++++---- logstash/tasks/main.yml | 14 ++++++++++++-- 11 files changed, 98 insertions(+), 21 deletions(-) diff --git a/elastic-sources-list/tasks/main.yml b/elastic-sources-list/tasks/main.yml index 74476e89..a01c0cd6 100644 --- a/elastic-sources-list/tasks/main.yml +++ b/elastic-sources-list/tasks/main.yml @@ -22,6 +22,7 @@ apt_repository: repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main" state: present + update_cache: yes tags: - elastic - system diff --git a/elasticsearch/meta/main.yml b/elasticsearch/meta/main.yml index 88494f24..a2f662c3 100644 --- a/elasticsearch/meta/main.yml +++ b/elasticsearch/meta/main.yml @@ -23,6 +23,4 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of # alphanumeric characters. Maximum 20 tags per role. -dependencies: - - evogalaxy.java8 - - evogalaxy.elastic-sources-list +dependencies: [] diff --git a/elasticsearch/tasks/packages.yml b/elasticsearch/tasks/packages.yml index 7742318d..6a160094 100644 --- a/elasticsearch/tasks/packages.yml +++ b/elasticsearch/tasks/packages.yml @@ -1,9 +1,16 @@ --- +- name: install java8 + include_role: + name: java8 + +- name: install Elastic sources list + include_role: + name: elastics-sources-list + - name: Elasticsearch is installed apt: name: elasticsearch - update_cache: yes state: present tags: - packages diff --git a/filebeat/meta/main.yml b/filebeat/meta/main.yml index 9051e7fa..4e6139af 100644 --- a/filebeat/meta/main.yml +++ b/filebeat/meta/main.yml @@ -1,3 +1,19 @@ ---- -dependencies: - - { role: elastic-sources-list } +galaxy_info: + author: Evolix + description: Installation and basic configuration of Filebeat. + + issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues + + license: GPLv2 + + min_ansible_version: 2.2 + + platforms: + - name: Debian + versions: + - jessie + +dependencies: [] + # List your role dependencies here, one per line. + # Be sure to remove the '[]' above if you add dependencies + # to this list. diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index 84d1e8ea..28538058 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -1,9 +1,12 @@ --- +- name: Install Elastic sources list + include_role: + name: elastics-sources-list + - name: Filebeat is installed apt: name: filebeat - update_cache: yes state: present tags: - packages diff --git a/java8/meta/main.yml b/java8/meta/main.yml index 440b5624..632cd4f4 100644 --- a/java8/meta/main.yml +++ b/java8/meta/main.yml @@ -13,6 +13,3 @@ galaxy_info: - name: Debian versions: - jessie - -dependencies: - - { role: apt-repositories, apt_repositories_backports: True } diff --git a/java8/tasks/main.yml b/java8/tasks/main.yml index f9f996c2..4bd538fc 100644 --- a/java8/tasks/main.yml +++ b/java8/tasks/main.yml @@ -3,6 +3,13 @@ set_fact: java8_apt_release: '{% if ansible_distribution_release == "jessie" %}jessie-backports{% else %}{{ ansible_distribution_release }}{% endif %}' +- name: install jessie-backports + include_role: + name: apt-repositories + vars: + apt_repositories_install_backports: True + when: ansible_distribution_release == "jessie" + - name: Java 8 is installed apt: name: openjdk-8-jre diff --git a/kibana/meta/main.yml b/kibana/meta/main.yml index 9051e7fa..d0e7a891 100644 --- a/kibana/meta/main.yml +++ b/kibana/meta/main.yml @@ -1,3 +1,19 @@ ---- -dependencies: - - { role: elastic-sources-list } +galaxy_info: + author: Evolix + description: Installation and basic configuration of Kibana. + + issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues + + license: GPLv2 + + min_ansible_version: 2.2 + + platforms: + - name: Debian + versions: + - jessie + +dependencies: [] + # List your role dependencies here, one per line. + # Be sure to remove the '[]' above if you add dependencies + # to this list. diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml index a3911d9c..1ba748c2 100644 --- a/kibana/tasks/main.yml +++ b/kibana/tasks/main.yml @@ -1,9 +1,16 @@ --- +- name: Install java8 + include_role: + name: java8 + +- name: Install Elastic sources list + include_role: + name: elastics-sources-list + - name: Kibana is installed apt: name: kibana - update_cache: yes state: present tags: - packages diff --git a/logstash/meta/main.yml b/logstash/meta/main.yml index 5c6102f7..629e9f67 100644 --- a/logstash/meta/main.yml +++ b/logstash/meta/main.yml @@ -1,4 +1,19 @@ ---- -dependencies: - - { role: java8 } - - { role: elastic-sources-list } +galaxy_info: + author: Evolix + description: Installation and basic configuration of Logstash. + + issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues + + license: GPLv2 + + min_ansible_version: 2.2 + + platforms: + - name: Debian + versions: + - jessie + +dependencies: [] + # List your role dependencies here, one per line. + # Be sure to remove the '[]' above if you add dependencies + # to this list. diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml index c1817942..176958cc 100644 --- a/logstash/tasks/main.yml +++ b/logstash/tasks/main.yml @@ -1,9 +1,20 @@ --- +- name: Install java8 + include_role: + name: java8 + tags: + - packages + +- name: Install Elastic sources list + include_role: + name: elastics-sources-list + tags: + - packages + - name: Logstash is installed apt: name: logstash - update_cache: yes state: present tags: - packages @@ -13,7 +24,6 @@ name: logstash enabled: yes - - name: JVM Heap size (min) is set lineinfile: dest: /etc/logstash/jvm.options