Move generic tests into a shared spec file

test/integration/multi.yml

@@ -1,8 +1,8 @@
 ---
-#Test ability to deploy multiple instances to a machine
+# Test ability to deploy multiple instances to a machine
 - name: Elasticsearch Multi test - master on 9200
   hosts: localhost
-  tasks:
+  post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   vars:
     es_enable_xpack: false
@@ -13,11 +13,20 @@
     es_plugins:
       - plugin: ingest-geoip
   roles:
-    - { role: elasticsearch, es_instance_name: "master", es_data_dirs: ["/opt/elasticsearch/master"], es_config: { discovery.zen.ping.unicast.hosts: "localhost:9300", http.port: 9200, transport.tcp.port: 9300, node.data: false, node.master: true, bootstrap.memory_lock: true } }
+    - role: elasticsearch
+      es_instance_name: "master"
+      es_data_dirs: ["/opt/elasticsearch/master"]
+      es_config:
+        discovery.zen.ping.unicast.hosts: "localhost:9300"
+        http.port: 9200
+        transport.tcp.port: 9300
+        node.data: false
+        node.master: true
+        bootstrap.memory_lock: true
 
 - name: Elasticsearch Multi test - data on 9201
   hosts: localhost
-  tasks:
+  post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   vars:
     es_enable_xpack: false
@@ -28,5 +37,12 @@
     es_plugins:
       - plugin: ingest-geoip
   roles:
-    - { role: elasticsearch, es_instance_name: "node1", es_data_dirs: "/opt/elasticsearch/data-1,/opt/elasticsearch/data-2", es_config: { discovery.zen.ping.unicast.hosts: "localhost:9300", http.port: 9201, transport.tcp.port: 9301, node.data: true, node.master: false } }
-#Plugins installed for this test are specified in .kitchen.yml under suite
+    - role: elasticsearch
+      es_instance_name: "node1"
+      es_data_dirs: "/opt/elasticsearch/data-1,/opt/elasticsearch/data-2"
+      es_config: 
+        discovery.zen.ping.unicast.hosts: "localhost:9300"
+        http.port: 9201
+        transport.tcp.port: 9301
+        node.data: true
+        node.master: false