From dd7623fffef48b7e8b139596904ee43d068f12ea Mon Sep 17 00:00:00 2001 From: Maarten Bezemer Date: Thu, 3 Nov 2016 14:53:45 +0100 Subject: [PATCH 1/2] Fix issues with systemd service --- handlers/main.yml | 7 +++++-- tasks/elasticsearch-config.yml | 6 ++++-- tasks/elasticsearch-service.yml | 6 ------ tasks/main.yml | 3 --- 4 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 tasks/elasticsearch-service.yml diff --git a/handlers/main.yml b/handlers/main.yml index e98d041..72d3ad0 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,7 +1,10 @@ +- name: reload systemd configuration + command: systemctl daemon-reload +# Restart service and ensure it is enabled - name: restart elasticsearch service: name={{instance_init_script | basename}} state=restarted enabled=yes - when: es_restart_on_change and es_start_service and not elasticsearch_started.changed and ((plugin_installed is defined and plugin_installed.changed) or (xpack_state.changed) or (elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed)) + when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (xpack_state.changed) or (elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed)) - name: load-native-realms include: ./handlers/shield/elasticsearch-shield-native.yml @@ -14,4 +17,4 @@ - name: load-templates include: ./handlers/elasticsearch-templates.yml - when: es_templates \ No newline at end of file + when: es_templates diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml index 34943b4..8984fe3 100644 --- a/tasks/elasticsearch-config.yml +++ b/tasks/elasticsearch-config.yml @@ -42,7 +42,9 @@ - name: Copy Systemd File for Instance template: src=systemd/elasticsearch.j2 dest={{instance_sysd_script}} mode=0644 force=yes when: use_system_d - notify: restart elasticsearch + notify: + - reload systemd configuration + - restart elasticsearch #Copy the logging.yml - name: Copy Logging.yml File for Instance @@ -63,7 +65,7 @@ when: ansible_os_family == 'RedHat' - name: Delete Default Sysconfig File - file: dest=/usr/lib/systemd/system/elasticsearch.service state=absent + file: dest="{{ sysd_script }}" state=absent - name: Delete Default Configuration File file: dest=/etc/elasticsearch/elasticsearch.yml state=absent diff --git a/tasks/elasticsearch-service.yml b/tasks/elasticsearch-service.yml deleted file mode 100644 index 57a79af..0000000 --- a/tasks/elasticsearch-service.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Make sure the service is started, and restart if necessary -- name: Start elasticsearch service - service: name={{instance_init_script | basename}} state=started enabled=yes - when: es_start_service - register: elasticsearch_started - diff --git a/tasks/main.yml b/tasks/main.yml index cd2743b..ebf67b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -31,9 +31,6 @@ - include: xpack/elasticsearch-xpack.yml tags: - xpack -- include: elasticsearch-service.yml - tags: - - service - include: elasticsearch-templates.yml when: es_templates tags: From cc60a4ecbbd7059baa5a706bf79e17cb12d9b655 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Tue, 3 Jan 2017 18:10:45 +0000 Subject: [PATCH 2/2] Fix to use redhat_elasticsearch_install_from_repo --- tasks/elasticsearch-plugins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index ade229d..bf2ada0 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -3,7 +3,7 @@ # es_plugins_reinstall will be set to true if elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed # i.e. we have changed ES version(or we have clean installation of ES), or if no plugins listed. Otherwise it is false and requires explicitly setting. - set_fact: es_plugins_reinstall=true - when: (((debian_elasticsearch_install_from_repo is defined and debian_elasticsearch_install_from_repo.changed) or (redhat_elasticsearch_install_from_repo is defined and debian_elasticsearch_install_from_repo.changed)) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed)) or es_plugins is not defined or es_plugins is none + when: (((debian_elasticsearch_install_from_repo is defined and debian_elasticsearch_install_from_repo.changed) or (redhat_elasticsearch_install_from_repo is defined and redhat_elasticsearch_install_from_repo.changed)) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed)) or es_plugins is not defined or es_plugins is none - set_fact: list_command="list"