Clean up remaining yml test definitions

test/integration/multi.yml

@@ -29,7 +29,7 @@
   post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - role: elasticsearch
+    - elasticsearch
   vars:
     es_enable_xpack: false
     es_scripts: true

test/integration/oss-upgrade.yml

@@ -4,8 +4,9 @@
   post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - { role: elasticsearch, es_instance_name: "node1" }
+    - elasticsearch
   vars:
+    es_instance_name: "node1"
     es_version: "{{ '6.2.4' if es_major_version == '6.x' else '5.6.9' }}" # This is set to an older version than the current default to force an upgrade
     es_enable_xpack: false
     es_heap_size: "1g"
@@ -15,7 +16,8 @@
   post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - { role: elasticsearch, es_instance_name: "node1" }
+    - elasticsearch
   vars:
+    es_instance_name: "node1"
     es_enable_xpack: false
     es_heap_size: "1g"

test/integration/xpack.yml

@@ -5,14 +5,14 @@
   post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - role: elasticsearch
-      es_api_port: 9200
-      es_instance_name: "node1"
-      es_config:
-        http.port: 9200
-        transport.tcp.port: 9300
-        discovery.zen.ping.unicast.hosts: "localhost:9300"
+    - elasticsearch
   vars:
+    es_api_port: 9200
+    es_instance_name: "node1"
+    es_config:
+      http.port: 9200
+      transport.tcp.port: 9300
+      discovery.zen.ping.unicast.hosts: "localhost:9300"
     es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{{ es_version }}.zip"
     es_heap_size: 2g
     es_enable_xpack: true