From c4ca8c3764bcd9d284d75ea830bd8c6fd1ce4461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Sun, 8 Oct 2017 22:31:22 +0200 Subject: [PATCH] cleanup with dependencies on java8 --- elasticsearch/meta/main.yml | 4 +++- elasticsearch/tasks/packages.yml | 7 ------- filebeat/meta/main.yml | 1 + filebeat/tasks/main.yml | 2 +- jenkins/meta/main.yml | 27 +++++++++++++++++++++++++++ jenkins/tasks/main.yml | 4 ---- kibana/meta/main.yml | 1 + kibana/tasks/main.yml | 6 +----- logstash/meta/main.yml | 6 ++---- logstash/tasks/main.yml | 8 +------- 10 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 jenkins/meta/main.yml diff --git a/elasticsearch/meta/main.yml b/elasticsearch/meta/main.yml index a2f662c3..54156392 100644 --- a/elasticsearch/meta/main.yml +++ b/elasticsearch/meta/main.yml @@ -13,6 +13,7 @@ galaxy_info: - name: Debian versions: - jessie + - stretch galaxy_tags: [] # List tags for your role here, one per line. A tag is @@ -23,4 +24,5 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of # alphanumeric characters. Maximum 20 tags per role. -dependencies: [] +dependencies: + - java8 diff --git a/elasticsearch/tasks/packages.yml b/elasticsearch/tasks/packages.yml index 05d5bf46..3530d139 100644 --- a/elasticsearch/tasks/packages.yml +++ b/elasticsearch/tasks/packages.yml @@ -1,12 +1,5 @@ --- -- name: install java8 - include_role: - name: java8 - tags: - - elasticsearch - - packages - - name: APT https transport is enabled apt: name: apt-transport-https diff --git a/filebeat/meta/main.yml b/filebeat/meta/main.yml index 4e6139af..37aa6319 100644 --- a/filebeat/meta/main.yml +++ b/filebeat/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - name: Debian versions: - jessie + - stretch dependencies: [] # List your role dependencies here, one per line. diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index bc038b93..5029d6d4 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -36,7 +36,7 @@ - packages - name: Filebeat service is enabled - service: + systemd: name: filebeat enabled: yes diff --git a/jenkins/meta/main.yml b/jenkins/meta/main.yml new file mode 100644 index 00000000..eda76a17 --- /dev/null +++ b/jenkins/meta/main.yml @@ -0,0 +1,27 @@ +--- +galaxy_info: + author: Evolix + description: Install Jenkins + + issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues + + license: GPLv2 + + min_ansible_version: 2.2 + + platforms: + - name: Debian + versions: + - jessie + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is + # a keyword that describes and categorizes the role. + # Users find roles by searching for tags. Be sure to + # remove the '[]' above if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of + # alphanumeric characters. Maximum 20 tags per role. + +dependencies: + - java8 diff --git a/jenkins/tasks/main.yml b/jenkins/tasks/main.yml index 88db3b90..19496958 100644 --- a/jenkins/tasks/main.yml +++ b/jenkins/tasks/main.yml @@ -1,9 +1,5 @@ --- -- name: Include java8 role - include_role: - name: java8 - - name: Add jenkins GPG key apt_key: # url: https://jenkins-ci.org/debian/jenkins-ci.org.key diff --git a/kibana/meta/main.yml b/kibana/meta/main.yml index d0e7a891..dce2560a 100644 --- a/kibana/meta/main.yml +++ b/kibana/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - name: Debian versions: - jessie + - stretch dependencies: [] # List your role dependencies here, one per line. diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml index 9cf74638..9e0d6ce6 100644 --- a/kibana/tasks/main.yml +++ b/kibana/tasks/main.yml @@ -1,9 +1,5 @@ --- -- name: Install java8 - include_role: - name: java8 - - name: APT https transport is enabled apt: name: apt-transport-https @@ -39,7 +35,7 @@ - packages - name: Kibana service is enabled and started - service: + systemd: name: kibana enabled: yes state: started diff --git a/logstash/meta/main.yml b/logstash/meta/main.yml index 629e9f67..c74021e7 100644 --- a/logstash/meta/main.yml +++ b/logstash/meta/main.yml @@ -13,7 +13,5 @@ galaxy_info: versions: - jessie -dependencies: [] - # List your role dependencies here, one per line. - # Be sure to remove the '[]' above if you add dependencies - # to this list. +dependencies: + - java8 diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml index 16e9ae79..086bd4b3 100644 --- a/logstash/tasks/main.yml +++ b/logstash/tasks/main.yml @@ -1,11 +1,5 @@ --- -- name: Install java8 - include_role: - name: java8 - tags: - - packages - - name: APT https transport is enabled apt: name: apt-transport-https @@ -41,7 +35,7 @@ - packages - name: Logstash service is enabled - service: + systemd: name: logstash enabled: yes