fix: no_log only api_password for elasticsearch_template module

.gitignore

@@ -1 +1,2 @@
 .kitchen/*
+*.pyc

.kitchen.yml

@@ -1,27 +0,0 @@
----
-driver:
-  name: docker_cli
-
-transport:
-  name: docker_cli
-
-provisioner:
-  name: ansible_playbook
-  hosts: localhost
-  require_ansible_repo: false
-  require_ansible_omnibus: false
-  require_chef_for_busser: true
-  ansible_verbose: false
-  ansible_inventory: ./test/integration/inventory
-
-platforms:
-  - name: debian-9
-    driver_config:
-      image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.7' %>"
-      command: /bin/systemd
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      security_opt: seccomp=unconfined
-
-suites:
-  - name: default

CHANGELOG.md

@@ -5,6 +5,22 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+### Changed
+
+- replace kitchen to molecule
+
+### Fixed
+
+- no_log only api_password for elasticsearch_template module
+- add full python3 support
+
+## v1.1.0 - 2019-11-21
+
+### Added
+
+- new option to set heap size
+- manage index templates
+
 ## v1.0.0 - 2019-09-05
 
 ### Added

Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-group :development do
-  gem 'kitchen-ansible'
-  gem 'kitchen-docker_cli'
-  gem 'rubocop', '0.50.0'
-  gem 'test-kitchen'
-end

Gemfile.lock

@@ -1,130 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    bcrypt_pbkdf (1.0.1)
-    builder (3.2.3)
-    ed25519 (1.2.4)
-    equatable (0.6.1)
-    erubis (2.7.0)
-    ffi (1.11.1)
-    gssapi (1.3.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    httpclient (2.8.3)
-    kitchen-ansible (0.50.1)
-      net-ssh (>= 3)
-      test-kitchen (>= 1.4)
-    kitchen-docker_cli (0.19.0)
-      test-kitchen (>= 1.3)
-    license-acceptance (1.0.13)
-      pastel (~> 0.7)
-      tomlrb (~> 1.2)
-      tty-box (~> 0.3)
-      tty-prompt (~> 0.18)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    mixlib-install (3.11.21)
-      mixlib-shellout
-      mixlib-versioning
-      thor
-    mixlib-shellout (3.0.7)
-    mixlib-versioning (1.2.7)
-    multi_json (1.13.1)
-    necromancer (0.5.0)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
-    nori (2.6.0)
-    parallel (1.17.0)
-    parser (2.6.4.0)
-      ast (~> 2.4.0)
-    pastel (0.7.3)
-      equatable (~> 0.6)
-      tty-color (~> 0.5)
-    powerpack (0.1.2)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.3)
-    rubocop (0.50.0)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
-    rubyntlm (0.6.2)
-    rubyzip (1.2.3)
-    strings (0.1.6)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.1.0)
-    test-kitchen (2.3.2)
-      bcrypt_pbkdf (~> 1.0)
-      ed25519 (~> 1.2)
-      license-acceptance (~> 1.0, >= 1.0.11)
-      mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
-      net-ssh-gateway (>= 1.2, < 3.0)
-      thor (~> 0.19)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1)
-    thor (0.20.3)
-    tomlrb (1.2.8)
-    tty-box (0.4.1)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
-      tty-cursor (~> 0.7)
-    tty-color (0.5.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.19.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.6.0)
-    tty-reader (0.6.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    unicode-display_width (1.6.0)
-    unicode_utils (1.4.0)
-    winrm (2.3.2)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.1)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.2)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
-    wisper (2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  kitchen-ansible
-  kitchen-docker_cli
-  rubocop (= 0.50.0)
-  test-kitchen
-
-BUNDLED WITH
-   1.16.6

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 Adrien Waksberg
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,6 +1,6 @@
 # Ansible role: Elasticsearch
 
-[![Version](https://img.shields.io/badge/latest_version-1.0.0-green.svg)](https://git.yaegashi.fr/nishiki/ansible-role-elasticsearch/releases)
+[![Version](https://img.shields.io/badge/latest_version-1.1.0-green.svg)](https://git.yaegashi.fr/nishiki/ansible-role-elasticsearch/releases)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://git.yaegashi.fr/nishiki/ansible-role-elasticsearch/src/branch/master/LICENSE)
 
 Install and configure Elasticsearch
@@ -12,6 +12,7 @@ Install and configure Elasticsearch
 
 ## Role variables
 
+* `elasticsearch_heap_size` - set the heap size (default: `1g`)
 * `elasticsearch_config` - hash with the configuration (see [elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html))
 
 ```
@@ -19,6 +20,23 @@ Install and configure Elasticsearch
   path.logs: /var/log/elasticsearch
 ```
 
+* `elasticsearch_index_templates` - hash with the index templates configuration
+
+```
+  logstash:
+    index_patterns:
+      - 'logstash-*'
+    settings:
+      index:
+        number_of_replicas: 3
+    mappings:
+      metric:
+        type: short
+      date:
+        type: date
+        format: YYYY-MM-dd
+```
+
 ## How to use
 
 ```
@@ -29,25 +47,12 @@ Install and configure Elasticsearch
 
 ## Development
 
-### Test syntax with yamllint
-
-* install `python` and `python-pip`
-* install yamllint `pip install yamllint`
-* run `yamllint .`
-
-### Test syntax with ansible-lint
-
-* install `python` and `python-pip`
-* install yamllint `pip install ansible-lint`
-* run `ansible-lint .`
-
-### Tests with docker
+### Test with molecule and docker
 
 * install [docker](https://docs.docker.com/engine/installation/)
-* install ruby
-* install bundler `gem install bundler`
-* install dependencies `bundle install`
-* run the tests `kitchen test`
+* install `python3` and `python3-pip`
+* install molecule and dependencies `pip3 install molecule 'molecule[docker]' ansible-lint testinfra yamllint`
+* run `molecule test`
 
 ## License
 

defaults/main.yml

@@ -1,6 +1,8 @@
 ---
+elasticsearch_heap_size: 1g
 elasticsearch_config: {}
 elasticsearch_default_config:
   path.data: /var/lib/elasticsearch
   path.logs: /var/log/elasticsearch
 elasticsearch_full_config: '{{ elasticsearch_default_config|combine(elasticsearch_config) }}'
+elasticsearch_index_templates: {}

library/elasticsearch_template.py

@@ -0,0 +1,112 @@
+#!/usr/bin/python
+
+from ansible.module_utils.basic import *
+from ansible.module_utils.elasticsearch_api import *
+
+class ElasticsearchTemplate:
+  def __init__(self, api, name):
+    self.api   = api
+    self.name  = name
+    self.exist = False
+    self.data  = {}
+
+  def get_data(self):
+    status_code, data = self.api.get('_template/{}'.format(self.name))
+    if status_code == 200:
+      self.exist = True
+      self.data  = data[self.name]
+
+  def dict_has_changed(self, new_data, data):
+    for option, value in new_data.items():
+      if not option in data:
+        if value:
+          return True
+
+      elif type(value) is dict:
+        if not type(data[option]) is dict:
+          return True
+        for k, v in value.items():
+          if not k in data[option]:
+            return True
+          if str(data[option][k]) != str(v):
+            return True
+
+      elif type(value) is list:
+        if not type(data[option]) is list:
+          return True
+        if data[option].sort() != value.sort():
+          return True
+
+      elif data[option] != value:
+        return True
+
+    return False
+
+  def has_changed(self, options):
+    if options['index_patterns'].sort() != self.data['index_patterns'].sort():
+      return True
+
+    if options['settings']:
+      if self.dict_has_changed(options['settings'], self.data['settings']):
+        return True
+    elif self.data['settings']:
+      return True
+
+    if options['mappings']['properties']:
+      if not self.data['mappings']:
+        return True
+      elif self.dict_has_changed(options['mappings']['properties'], self.data['mappings']['properties']):
+        return True
+    else:
+      if self.data['mappings']:
+        return True
+
+    return False
+
+  def create(self, options):
+    self.api.put(
+      '_template/{}'.format(self.name),
+      options
+    )
+    
+def main():
+  fields = {
+    'name':           { 'type': 'str',  'required': True },
+    'index_patterns': { 'type': 'list', 'default': [] },
+    'settings':       { 'type': 'dict', 'default': {} },
+    'mappings':       { 'type': 'dict', 'default': {} },
+    'api_url':        { 'type': 'str',  'default': 'http://127.0.0.1:9200' },
+    'api_user':       { 'type': 'str',  'default': None },
+    'api_password':   { 'type': 'str',  'default': None, 'no_log': True },
+  }
+  module = AnsibleModule(argument_spec=fields)
+  changed = False
+
+  options = {
+    'index_patterns': module.params['index_patterns'],
+    'settings':       module.params['settings'],
+    'mappings': {
+      'properties':   module.params['mappings'],
+    },
+  }
+
+  api = ElasticsearchApi(
+    module.params['api_url'],
+    module.params['api_user'],
+    module.params['api_password']
+  )
+
+  template = ElasticsearchTemplate(
+    api,
+    module.params['name'],
+  )
+  template.get_data()
+
+  if not template.exist or template.has_changed(options):
+    template.create(options)
+    changed = True
+
+  module.exit_json(changed=changed)
+
+if __name__ == '__main__':
+  main()

module_utils/elasticsearch_api.py

@@ -0,0 +1,38 @@
+#!/usr/bin/python
+import requests
+import base64
+
+class ElasticsearchApi:
+  def __init__(self, url, user, password):
+    self.url     = url
+    self.headers = {}
+    if user and password:
+      token = base64.b64encode('{}:{}',)
+      self.headers = { 'Authorization': 'Basic ' + base64.b64encode({},) }
+
+  def get(self, path):
+    r = requests.get(
+      '{}/{}'.format(self.url, path),
+      headers=self.headers
+    )
+
+    if r.status_code == 500:
+      raise Exception('Server return 500 error: {}'.format(r.text))
+    elif r.status_code == 401:
+      raise Exception('Authentification has failed')
+      
+    return r.status_code, r.json()
+
+  def put(self, path, data):
+    r = requests.put(
+      '{}/{}'.format(self.url, path),
+      headers=self.headers,
+      json=data
+    )
+    
+    if r.status_code == 500:
+      raise Exception('Server return 500 error: {}'.format(r.text))
+    elif r.status_code == 401:
+      raise Exception('Authentification has failed')
+    elif r.status_code != 200:
+      raise Exception('Server return an unknown error: {}'.format(r.text))

molecule/default/converge.yml

@@ -0,0 +1,22 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    elasticsearch_heap_size: 512m
+    elasticsearch_index_templates:
+      test:
+        index_patterns:
+          - 'hello*'
+        settings:
+          index:
+            number_of_replicas: 1
+        mappings:
+          metrics:
+            type: short
+  roles:
+    - ansible-role-elasticsearch
+#
+#  tasks:
+#    - name: "Include ansible-role-elasticsearch"
+#      include_role:
+#        name: "ansible-role-elasticsearch"

molecule/default/molecule.yml

@@ -0,0 +1,18 @@
+---
+driver:
+  name: docker
+platforms:
+  - name: debian10
+    image: nishiki/debian10:molecule
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    command: /bin/systemd
+    capabilities:
+      - SYS_ADMIN
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+verifier:
+  name: testinfra

molecule/default/tests/test_default.py

@@ -0,0 +1,32 @@
+import os
+import testinfra.utils.ansible_runner
+
+def test_packages(host):
+  package = host.package('elasticsearch')
+  assert package.is_installed
+
+def test_config_file(host):
+  config = host.file('/etc/elasticsearch/elasticsearch.yml')
+  assert config.user == 'root'
+  assert config.group == 'elasticsearch'
+  assert config.mode == 0o640
+  assert config.contains('path.data: /var/lib/elasticsearch')
+
+def test_service(host):
+  service = host.service('elasticsearch')
+  assert service.is_running
+  assert service.is_enabled
+
+def test_socket(host):
+  for port in [9200, 9300]:
+    socket = host.socket('tcp://127.0.0.1:%d' % (port))
+    assert socket.is_listening
+
+def test_java_memory(host):
+  process = host.process.get(user='elasticsearch', comm='java')
+  assert '-Xms512m' in process.args
+  assert '-Xmx512m' in process.args
+
+def test_elasticsearch_template(host):
+  result = host.check_output('curl -v http://127.0.0.1:9200/_template/test')
+  assert '"number_of_replicas":"1"' in result

tasks/config.yml

@@ -0,0 +1,21 @@
+---
+- name: set heap size
+  lineinfile:
+    path: /etc/elasticsearch/jvm.options
+    regexp: '^-{{ item }}'
+    line: '-{{ item }}{{ elasticsearch_heap_size }}'
+  loop:
+    - Xms
+    - Xmx
+  notify: restart elasticsearch
+  tags: elasticsearch
+
+- name: copy config file
+  copy:
+    content: '{{ elasticsearch_full_config|to_yaml }}'
+    dest: /etc/elasticsearch/elasticsearch.yml
+    owner: root
+    group: elasticsearch
+    mode: 0640
+  notify: restart elasticsearch
+  tags: elasticsearch

tasks/data.yml

@@ -0,0 +1,10 @@
+---
+- name: copy index templates
+  elasticsearch_template:
+    name: '{{ item.key }}'
+    index_patterns: '{{ item.value.index_patterns }}'
+    settings: '{{ item.value.settings|default({}) }}'
+    mappings: '{{ item.value.mappings|default({}) }}'
+  loop: '{{ elasticsearch_index_templates|dict2items }}'
+  run_once: true
+  tags: elasticsearch

tasks/main.yml

@@ -1,46 +1,5 @@
 ---
-- name: install dependencies packages
-  apt:
-    name: apt-transport-https
-  retries: 2
-  register: result
-  until: result is succeeded
-  tags: elasticsearch
-
-- name: add repository key
-  apt_key:
-    url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
-  retries: 2
-  register: result
-  until: result is succeeded
-  tags: elasticsearch
-
-- name: add repository
-  apt_repository:
-    repo: deb https://artifacts.elastic.co/packages/7.x/apt stable main
-  tags: elasticsearch
-
-- name: install package
-  apt:
-    name: elasticsearch
-  retries: 2
-  register: result
-  until: result is succeeded
-  tags: elasticsearch
-
-- name: copy config file
-  copy:
-    content: '{{ elasticsearch_full_config|to_yaml }}'
-    dest: /etc/elasticsearch/elasticsearch.yml
-    owner: root
-    group: elasticsearch
-    mode: 0640
-  notify: restart elasticsearch
-  tags: elasticsearch
-
-- name: enable and start service
-  systemd:
-    name: elasticsearch
-    state: started
-    enabled: true
-  tags: elasticsearch
+- import_tasks: packages.yml
+- import_tasks: config.yml
+- import_tasks: service.yml
+- import_tasks: data.yml

tasks/packages.yml

@@ -0,0 +1,32 @@
+---
+- name: install dependencies packages
+  package:
+    name:
+      - apt-transport-https
+      - python-requests
+      - python3-requests
+  retries: 2
+  register: result
+  until: result is succeeded
+  tags: elasticsearch
+
+- name: add repository key
+  apt_key:
+    url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+  retries: 2
+  register: result
+  until: result is succeeded
+  tags: elasticsearch
+
+- name: add repository
+  apt_repository:
+    repo: deb https://artifacts.elastic.co/packages/7.x/apt stable main
+  tags: elasticsearch
+
+- name: install package
+  package:
+    name: elasticsearch
+  retries: 2
+  register: result
+  until: result is succeeded
+  tags: elasticsearch

tasks/service.yml

@@ -0,0 +1,13 @@
+---
+- name: enable and start service
+  systemd:
+    name: elasticsearch
+    state: started
+    enabled: true
+  tags: elasticsearch
+
+- name: wait for api is available
+  wait_for:
+    port: 9200
+    timeout: 10
+  tags: elasticsearch

test/integration/default/default.yml

@@ -1,7 +0,0 @@
----
-- hosts: localhost
-  connection: local
-  vars:
-
-  roles:
-    - ansible-role-elasticsearch

test/integration/default/serverspec/default_spec.rb

@@ -1,31 +0,0 @@
-require 'serverspec'
-
-set :backend, :exec
-
-puts
-puts '================================'
-puts %x(ansible --version)
-puts '================================'
-
-sleep 10
-
-describe package('elasticsearch') do
-  it { should be_installed }
-end
-
-describe file('/etc/elasticsearch/elasticsearch.yml') do
-  it { should be_file }
-  it { should be_mode 640 }
-  it { should be_owned_by 'root' }
-  it { should be_grouped_into 'elasticsearch' }
-  it { should contain 'path.data: /var/lib/elasticsearch' }
-end
-
-describe service('elasticsearch') do
-  it { should be_enabled }
-  it { should be_running.under('systemd') }
-end
-
-describe port(9200) do
-  it { should be_listening }
-end

test/integration/inventory

@@ -1 +0,0 @@
-localhost