Test fixes + ensuring node is started for templates

test/integration/config-2x/serverspec/default_spec.rb

@@ -1,6 +1,6 @@
 require 'config_spec'
 
 describe 'Config Tests v 2.x' do
-  include_examples 'config::init', "2.2.0"
+  include_examples 'config::init', "2.3.4"
 end
 

test/integration/helpers/serverspec/package_spec.rb

@@ -16,7 +16,6 @@ shared_examples 'package::init' do  |es_version,plugins|
 
   describe file('/etc/elasticsearch/node1/elasticsearch.yml') do
     it { should be_file }
-    it { should contain 'path.plugins: /usr/share/elasticsearch/plugins/node1' }
     it { should contain 'http.port: 9200' }
     it { should contain 'transport.tcp.port: 9300' }
     it { should contain 'discovery.zen.ping.unicast.hosts: localhost:9300' }
@@ -66,14 +65,14 @@ shared_examples 'package::init' do  |es_version,plugins|
     end
   end
 
-  describe file('/usr/share/elasticsearch/plugins/node1') do
+  describe file('/usr/share/elasticsearch/plugins') do
     it { should be_directory }
     it { should be_owned_by 'elasticsearch' }
   end
 
 
   for plugin in plugins
-    describe file('/usr/share/elasticsearch/plugins/node1/'+plugin) do
+    describe file('/usr/share/elasticsearch/plugins/'+plugin) do
       it { should be_directory }
       it { should be_owned_by 'elasticsearch' }
     end

test/integration/multi-2x/serverspec/default_spec.rb

@@ -2,7 +2,7 @@ require 'multi_spec'
 
 
 describe 'Multi Tests v 2.x' do
-  include_examples 'multi::init', "2.2.0", ["kopf","license","marvel-agent"]
+  include_examples 'multi::init', "2.3.4", ["kopf","license","marvel-agent"]
 end
 
 

test/integration/package-2x/serverspec/default_spec.rb

@@ -2,5 +2,5 @@ require 'package_spec'
 
 
 describe 'Package Tests v 2.x' do
-  include_examples 'package::init', "2.2.0", ["kopf","license","marvel-agent"]
+  include_examples 'package::init', "2.3.4", ["kopf","license","marvel-agent"]
 end

test/integration/standard-2x/serverspec/default_spec.rb

@@ -2,7 +2,7 @@ require 'standard_spec'
 
 
 describe 'Standard Tests v 2.x' do
-  include_examples 'standard::init', "2.2.0"
+  include_examples 'standard::init', "2.3.4"
 end
 
 

test/integration/xpack.yml

@@ -1,6 +1,6 @@
 ---
 - name: Elasticsearch Xpack tests
-  hosts: localhost
+  hosts: localhostpost
   roles:
     - { role: elasticsearch, es_config: { "http.port": 9200, "transport.tcp.port":9300, discovery.zen.ping.unicast.hosts: "localhost:9300" }, es_instance_name: "shield_node" }
   vars: