Merge pull request #88 from qk4l/master

Removed bare variables
This commit is contained in:
gingerwizard 2016-04-03 18:37:00 +01:00
commit 205840a5e4
3 changed files with 8 additions and 7 deletions

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
.kitchen/ .kitchen/
*.lock *.lock
*.pyc
.vendor .vendor
.bundle .bundle
Converging Converging

View file

@ -20,7 +20,7 @@
- name: Remove elasticsearch plugins - name: Remove elasticsearch plugins
command: "{{es_home}}/bin/plugin remove {{item}} --silent" command: "{{es_home}}/bin/plugin remove {{item}} --silent"
ignore_errors: yes ignore_errors: yes
with_items: installed_plugins.stdout_lines with_items: "{{ installed_plugins.stdout_lines }}"
when: es_plugins_reinstall and installed_plugins.stdout_lines | length > 0 and not 'No plugin detected' in installed_plugins.stdout_lines[0] when: es_plugins_reinstall and installed_plugins.stdout_lines | length > 0 and not 'No plugin detected' in installed_plugins.stdout_lines[0]
notify: restart elasticsearch notify: restart elasticsearch
environment: environment:
@ -34,7 +34,7 @@
register: plugin_installed register: plugin_installed
failed_when: "'ERROR' in plugin_installed.stdout" failed_when: "'ERROR' in plugin_installed.stdout"
changed_when: plugin_installed.rc == 0 changed_when: plugin_installed.rc == 0
with_items: es_plugins with_items: "{{ es_plugins }}"
when: es_plugins is defined and not es_plugins is none when: es_plugins is defined and not es_plugins is none
notify: restart elasticsearch notify: restart elasticsearch
environment: environment:

View file

@ -7,8 +7,8 @@
when: es_templates_fileglob is not defined when: es_templates_fileglob is not defined
- name: Copy templates to elasticsearch - name: Copy templates to elasticsearch
copy: src={{ item }} dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }} copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
with_fileglob: es_templates_fileglob with_fileglob: "{{ es_templates_fileglob }}"
- set_fact: http_port=9200 - set_fact: http_port=9200
@ -24,4 +24,4 @@
- name: Install template(s) - name: Install template(s)
command: "curl -sL -XPUT http://localhost:{{http_port}}/_template/{{item}} -d @/etc/elasticsearch/templates/{{item}}.json" command: "curl -sL -XPUT http://localhost:{{http_port}}/_template/{{item}} -d @/etc/elasticsearch/templates/{{item}}.json"
with_items: resultstemplate.stdout_lines with_items: "{{ resultstemplate.stdout_lines }}"