From 9ba7c66f5fa6589fc0a02cbab08715973e28d954 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 31 Jan 2017 11:47:29 +0100 Subject: [PATCH] a bit of syntax --- elasticsearch/tasks/bootstrap_checks.yml | 10 +++++----- elasticsearch/tasks/datadir.yml | 2 +- tomcat-instance/tasks/main.yml | 10 ++++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/elasticsearch/tasks/bootstrap_checks.yml b/elasticsearch/tasks/bootstrap_checks.yml index f9f75e7a..b7d6547d 100644 --- a/elasticsearch/tasks/bootstrap_checks.yml +++ b/elasticsearch/tasks/bootstrap_checks.yml @@ -6,7 +6,7 @@ failed_when: False changed_when: False tags: - - config + - config - name: Maximum map count check sysctl: @@ -15,7 +15,7 @@ sysctl_file: /etc/sysctl.d/elasticsearch.conf when: "{{ max_map_count|int < 262144 }}" tags: - - config + - config - name: bootstrap.memory_lock lineinfile: @@ -24,7 +24,7 @@ regexp: "^bootstrap.memory_lock:" insertafter: "^# *bootstrap.memory_lock:" tags: - - config + - config - name: Create a system config directory for systemd overrides file: @@ -38,6 +38,6 @@ option: "LimitMEMLOCK" value: "infinity" notify: - - reload elasticsearch unit + - reload elasticsearch unit tags: - - config + - config diff --git a/elasticsearch/tasks/datadir.yml b/elasticsearch/tasks/datadir.yml index 2a896226..e60ea4c3 100644 --- a/elasticsearch/tasks/datadir.yml +++ b/elasticsearch/tasks/datadir.yml @@ -40,5 +40,5 @@ name: elasticsearch state: started tags: - - elasticsearch + - elasticsearch when: elasticsearch_custom_datadir and elasticsearch_custom_datadir != elasticsearch_current_real_datadir_test.stdout and not elasticsearch_custom_datadir_test.stat.exists diff --git a/tomcat-instance/tasks/main.yml b/tomcat-instance/tasks/main.yml index 5799df85..7c294c50 100644 --- a/tomcat-instance/tasks/main.yml +++ b/tomcat-instance/tasks/main.yml @@ -6,11 +6,17 @@ register: tomcat_instance_stat - include: tomcat.yml + - include: nagios.yml + - include: check.yml + - include: user.yml + - include: systemd.yml + - include: alias.yml - when: tomcat_instance_stat.stat.exists != True + when: not tomcat_instance_stat.stat.exists + - include: bootstrap.yml - when: tomcat_instance_stat.stat.exists != True + when: not tomcat_instance_stat.stat.exists