Skip to content

Commit

Permalink
Merge pull request elastic#88 from qk4l/master
Browse files Browse the repository at this point in the history
Removed bare variables
  • Loading branch information
gingerwizard committed Apr 3, 2016
2 parents 2b5d7c3 + c7e449f commit 205840a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.kitchen/
*.lock
*.pyc
.vendor
.bundle
Converging
TODO
.idea/
elasticsearch.iml
elasticsearch.iml
6 changes: 3 additions & 3 deletions tasks/elasticsearch-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- name: Remove elasticsearch plugins
command: "{{es_home}}/bin/plugin remove {{item}} --silent"
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]
notify: restart elasticsearch
environment:
Expand All @@ -34,7 +34,7 @@
register: plugin_installed
failed_when: "'ERROR' in plugin_installed.stdout"
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
notify: restart elasticsearch
environment:
Expand All @@ -43,4 +43,4 @@

#Set permissions on plugins directory
- name: Set Plugin Directory Permissions
file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes
file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes
6 changes: 3 additions & 3 deletions tasks/elasticsearch-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
when: es_templates_fileglob is not defined

- name: Copy templates to elasticsearch
copy: src={{ item }} dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }}
with_fileglob: es_templates_fileglob
copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
with_fileglob: "{{ es_templates_fileglob }}"

- set_fact: http_port=9200

Expand All @@ -24,4 +24,4 @@

- name: Install template(s)
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 }}"

0 comments on commit 205840a

Please sign in to comment.