aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/ec2-setup.yml2
-rw-r--r--ansible/roles/ec2/tasks/setup.yml11
-rw-r--r--ansible/roles/ec2/vars/main.yml6
3 files changed, 7 insertions, 12 deletions
diff --git a/ansible/ec2-setup.yml b/ansible/ec2-setup.yml
index 787d8670e..37396d523 100644
--- a/ansible/ec2-setup.yml
+++ b/ansible/ec2-setup.yml
@@ -1,6 +1,6 @@
---
- name: Provision EC2 instances
- hosts: local
+ hosts: localhost
gather_facts: false
roles:
- ec2
diff --git a/ansible/roles/ec2/tasks/setup.yml b/ansible/roles/ec2/tasks/setup.yml
index 0876d8d2d..299b55c35 100644
--- a/ansible/roles/ec2/tasks/setup.yml
+++ b/ansible/roles/ec2/tasks/setup.yml
@@ -24,10 +24,9 @@
region: "{{ region }}"
key_name: "{{ keypair }}"
instance_tags:
- Name: test_runner
+ Name: "{{ item }}"
+ Role: client-tests
count_tag:
- Name: test_runner
- exact_count: "{{ total_no_instances }}"
-# volumes:
-# - device_name: /dev/xvda
-# volume_size: "{{ volume_size_gb }}"
+ Name: "{{ item }}"
+ exact_count: 1
+ with_sequence: start=0 end={{ total_no_instances - 1 }} format=testrunner-%1u
diff --git a/ansible/roles/ec2/vars/main.yml b/ansible/roles/ec2/vars/main.yml
index ea260c927..f5cf28596 100644
--- a/ansible/roles/ec2/vars/main.yml
+++ b/ansible/roles/ec2/vars/main.yml
@@ -4,13 +4,9 @@
instance_type: c4.xlarge
security_group: client-tests
-# image: ami-d6e7c084
image: ami-9eaa1cf6
-# region: ap-southeast-1
region: us-east-1
keypair: christoph
-# keypair: client-tests
-volume_size_gb: 50
# limit access to AWS to these clients in CDIR notation
ip_access_range: 0.0.0.0/0
@@ -18,4 +14,4 @@ ip_access_range: 0.0.0.0/0
project_description: https://github.com/ethereum/tests
-total_no_instances: 1
+total_no_instances: 3