script fixes

defaults/main.yml

@@ -6,7 +6,6 @@ es_use_repository: true
 es_start_service: true
 es_plugins_reinstall: false
 es_scripts: false
-es_scripts_src: scripts
 es_templates: false
 es_user: elasticsearch
 es_group: elasticsearch

tasks/elasticsearch-scripts.yml

@@ -1,12 +1,13 @@
 ---
 
-- set_fact: es_script_dir={{ es_conf_dir }}/{{es_instance_name}}/scripts
+- set_fact: es_script_dir={{ es_conf_dir }}/{{es_instance_name}}
 
 - set_fact: es_script_dir={{es_config['path.scripts']}}
   when: es_config['path.scripts'] is defined
 
 - name: Create script dir
   file: state=directory path={{ es_script_dir }} owner={{ es_user }} group={{ es_group }}
+  when: es_config['path.scripts'] is defined
 
 - name: Copy scripts to elasticsearch
-  copy: src={{es_scripts_src}} dest={{ es_script_dir }}
+  copy: src=scripts dest={{ es_script_dir }} owner={{ es_user }} group={{ es_group }}

tasks/elasticsearch-templates.yml

@@ -1,5 +1,6 @@
 ---
 #TODO: How to handle in multi node
+# 1. Template directory needs to be specifiable. 2. Port needs to based on configuration
 - name: Copy templates to elasticsearch
   copy: src=templates dest=/etc/elasticsearch/
 

templates/elasticsearch.yml.j2

@@ -18,7 +18,3 @@ path.data: {{ data_dir }}
 path.work: {{ work_dir }}
 
 path.logs: {{ log_dir }}
-
-{% if es_scripts and es_config['path.scripts'] is not defined %}
-path.scripts: {{ es_conf_dir }}/{{es_instance_name}}/scripts
-{% endif %}

test/integration/package.yml

@@ -5,4 +5,3 @@
     - { role: elasticsearch, es_config: { "discovery.zen.ping.multicast.enabled": true }, es_instance_name: "node1" }
   vars:
     es_scripts: true
-    es_scripts_src: "./test/package/scripts/"

test/integration/package/serverspec/default_spec.rb

@@ -23,6 +23,11 @@ context "basic tests" do
     it { should be_owned_by 'elasticsearch' }
   end
 
+  describe file('/etc/elasticsearch/node1/scripts/calculate-score.groovy') do
+    it { should be_file }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
   describe 'Node listening' do
     it 'listening in port 9200' do
       expect(port 9200).to be_listening