Fix possibility to launch multiple VMs on EC2 (178 issue)

aws/bootnode.yml

@@ -18,11 +18,6 @@
           from_port: 22
           to_port: 22
           cidr_ip: 0.0.0.0/0
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
   tags: bootnode
 
 
@@ -37,28 +32,28 @@
   tasks:
     - name: Launch instance
       ec2:
-        id: "{{ bootnode_instance_name }}"
+        id: "{{ bootnode_instance_name }}-{{ item }}"
         ec2_access_key: "{{ access_key }}"
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags:
-          Name: "{{ bootnode_instance_name }}"
+          Name: "{{ bootnode_instance_name }}-{{ item }}"
         group: "{{ bootnode_security_group }}"
         instance_type: "{{ bootnode_instance_type }}"
         image: "{{ image }}"
-        count: "{{ bootnode_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
         volumes: "{{ volumes }}"
         assign_public_ip: yes
+      with_sequence: "count={{ bootnode_count_instances }}"
       register:   ec2
     - name: Add new instance to host group
-      add_host: hostname={{ item.public_ip }} groupname=launched
-      with_items: "{{ ec2.instances }}"
+      add_host: hostname={{ item.instances[0].public_ip }} groupname=launched
+      with_items: "{{ ec2.results }}"
     - name: Wait for SSH to come up
-      wait_for: host={{ item.public_ip }} port=22 delay=90 timeout=320 state=started
-      with_items: "{{ ec2.instances }}"
+      wait_for: host={{ item.instances[0].public_ip }} port=22 delay=90 timeout=320 state=started
+      with_items: "{{ ec2.results }}"
       when: ec2.changed
   tags: bootnode
 

aws/explorer.yml

@@ -18,11 +18,6 @@
           from_port: 22
           to_port: 22
           cidr_ip: 0.0.0.0/0
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
   tags: explorer
 
 
@@ -37,28 +32,28 @@
   tasks:
     - name: Launch instance
       ec2:
-        id: "{{ explorer_instance_name }}"
+        id: "{{ explorer_instance_name }}-{{ item }}"
         ec2_access_key: "{{ access_key }}"
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags:
-          Name: "{{ explorer_instance_name }}"
+          Name: "{{ explorer_instance_name }}-{{ item }}"
         group: "{{ explorer_security_group }}"
         instance_type: "{{ explorer_instance_type }}"
         image: "{{ image }}"
-        count: "{{ explorer_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
         volumes: "{{ volumes }}"
         assign_public_ip: yes
+      with_sequence: "count={{ explorer_count_instances }}"
       register:   ec2
     - name: Add new instance to host group
-      add_host: hostname={{ item.public_ip }} groupname=launched
-      with_items: "{{ ec2.instances }}"
+      add_host: hostname={{ item.instances[0].public_ip }} groupname=launched
+      with_items: "{{ ec2.results }}"
     - name: Wait for SSH to come up
-      wait_for: host={{ item.public_ip }} port=22 delay=90 timeout=320 state=started
-      with_items: "{{ ec2.instances }}"
+      wait_for: host={{ item.instances[0].public_ip }} port=22 delay=90 timeout=320 state=started
+      with_items: "{{ ec2.results }}"
       when: ec2.changed
 tags: explorer
 

aws/moc.yml

@@ -18,11 +18,6 @@
           from_port: 22
           to_port: 22
           cidr_ip: 0.0.0.0/0
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
   tags: moc
 
 
@@ -37,28 +32,28 @@
   tasks:
     - name: Launch instance
       ec2:
-        id: "{{ moc_instance_name }}"
+        id: "{{ moc_instance_name }}-{{ item }}"
         ec2_access_key: "{{ access_key }}"
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags:
-          Name: "{{ moc_instance_name }}"
+          Name: "{{ moc_instance_name }}-{{ item }}"
         group: "{{ moc_security_group }}"
         instance_type: "{{ moc_instance_type }}"
         image: "{{ image }}"
-        count: "{{ moc_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
         volumes: "{{ volumes }}"
         assign_public_ip: yes
+      with_sequence: "count={{ explorer_count_instances }}"
       register:   ec2
     - name: Add new instance to host group
-      add_host: hostname={{ item.public_ip }} groupname=launched
-      with_items: "{{ ec2.instances }}"
+      add_host: hostname={{ item.instances[0].public_ip }} groupname=launched
+      with_items: "{{ ec2.results }}"
     - name: Wait for SSH to come up
-      wait_for: host={{ item.public_ip }} port=22 delay=90 timeout=320 state=started
-      with_items: "{{ ec2.instances }}"
+      wait_for: host={{ item.instances[0].public_ip }} port=22 delay=90 timeout=320 state=started
+      with_items: "{{ ec2.results }}"
       when: ec2.changed
   tags: moc
 

aws/netstat.yml

@@ -18,11 +18,6 @@
           from_port: 22
           to_port: 22
           cidr_ip: 0.0.0.0/0
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
   tags: netstat
 
 
@@ -37,28 +32,28 @@
   tasks:
     - name: Launch instance
       ec2:
-        id: "{{ netstat_instance_name }}"
+        id: "{{ netstat_instance_name }}-{{ item }}"
         ec2_access_key: "{{ access_key }}"
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags:
-          Name: "{{ netstat_instance_name }}"
+          Name: "{{ netstat_instance_name }}-{{ item }}"
         group: "{{ netstat_security_group }}"
         instance_type: "{{ netstat_instance_type }}"
         image: "{{ image }}"
-        count: "{{ netstat_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
         volumes: "{{ volumes }}"
         assign_public_ip: yes
+      with_items: "count={{ netstat_count_instances }}"
       register:   ec2
     - name: Add new instance to host group
-      add_host: hostname={{ item.public_ip }} groupname=launched
-      with_items: "{{ ec2.instances }}"
+      add_host: hostname={{ item.instances[0].public_ip }} groupname=launched
+      with_items: "{{ ec2.results }}"
     - name: Wait for SSH to come up
-      wait_for: host={{ item.public_ip }} port=22 delay=90 timeout=320 state=started
-      with_items: "{{ ec2.instances }}"
+      wait_for: host={{ item.instances[0].public_ip }} port=22 delay=90 timeout=320 state=started
+      with_items: "{{ ec2.results }}"
       when: ec2.changed
   tags: netstat
 

aws/roles/bootnode-access/tasks/ec2.yml

@@ -10,23 +10,6 @@
       purge_rules: true
       vpc_id: "{{ vpc_id }}"
 
-- name: Allow outbound traffic
-  delegate_to: localhost
-  ec2_group:
-      ec2_access_key: "{{ access_key }}"
-      ec2_secret_key: "{{ secret_key }}"
-      name: "{{ bootnode_security_group }}"
-      description: "Default security group"
-      region: "{{ region }}"
-      purge_rules_egress: false
-      purge_rules: false
-      vpc_id: "{{ vpc_id }}"
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
-
 - name: Add ssh access
   delegate_to: localhost
   ec2_group:

aws/roles/explorer-access/tasks/ec2.yml

@@ -10,23 +10,6 @@
       purge_rules: true
       vpc_id: "{{ vpc_id }}"
 
-- name: Allow outbound traffic
-  delegate_to: localhost
-  ec2_group:
-      ec2_access_key: "{{ access_key }}"
-      ec2_secret_key: "{{ secret_key }}"
-      name: "{{ explorer_security_group }}"
-      description: "Default security group"
-      region: "{{ region }}"
-      purge_rules_egress: false
-      purge_rules: false
-      vpc_id: "{{ vpc_id }}"
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
-
 - name: Add ssh access
   delegate_to: localhost
   ec2_group:

aws/roles/moc-access/tasks/ec2.yml

@@ -10,23 +10,6 @@
       purge_rules: true
       vpc_id: "{{ vpc_id }}"
 
-- name: Allow outbound traffic
-  delegate_to: localhost
-  ec2_group:
-      ec2_access_key: "{{ access_key }}"
-      ec2_secret_key: "{{ secret_key }}"
-      name: "{{ moc_security_group }}"
-      description: "Default security group"
-      region: "{{ region }}"
-      purge_rules_egress: false
-      purge_rules: false
-      vpc_id: "{{ vpc_id }}"
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
-
 - name: Add ssh access
   delegate_to: localhost
   ec2_group:

aws/roles/netstat-access/tasks/ec2.yml

@@ -10,23 +10,6 @@
       purge_rules: true
       vpc_id: "{{ vpc_id }}"
 
-- name: Allow outbound traffic
-  delegate_to: localhost
-  ec2_group:
-      ec2_access_key: "{{ access_key }}"
-      ec2_secret_key: "{{ secret_key }}"
-      name: "{{ netstat_security_group }}"
-      description: "Default security group"
-      region: "{{ region }}"
-      purge_rules_egress: false
-      purge_rules: false
-      vpc_id: "{{ vpc_id }}"
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
-
 - name: Add ssh access
   delegate_to: localhost
   ec2_group:

aws/roles/validator-access/tasks/ec2.yml

@@ -10,23 +10,6 @@
       purge_rules: true
       vpc_id: "{{ vpc_id }}"
 
-- name: Allow outbound traffic
-  delegate_to: localhost
-  ec2_group:
-      ec2_access_key: "{{ access_key }}"
-      ec2_secret_key: "{{ secret_key }}"
-      name: "{{ validator_security_group }}"
-      description: "Default security group"
-      region: "{{ region }}"
-      purge_rules_egress: false
-      purge_rules: false
-      vpc_id: "{{ vpc_id }}"
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
-
 - name: Add ssh access
   delegate_to: localhost
   ec2_group:

aws/validator.yml

@@ -18,11 +18,6 @@
           from_port: 22
           to_port: 22
           cidr_ip: 0.0.0.0/0
-      rules_egress:
-        - proto: all
-          from_port: all
-          to_port: all
-          cidr_ip: 0.0.0.0/0
   tags: validator
 
 
@@ -37,28 +32,28 @@
   tasks:
     - name: Launch instance
       ec2:
-        id: "{{ validator_instance_name }}"
+        id: "{{ validator_instance_name }}-{{ item }}"
         ec2_access_key: "{{ access_key }}"
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags:
-          Name: "{{ validator_instance_name }}"
+          Name: "{{ validator_instance_name }}-{{ item }}"
         group: "{{ validator_security_group }}"
         instance_type: "{{ validator_instance_type }}"
         image: "{{ image }}"
-        count: "{{ validator_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
         volumes: "{{ volumes }}"
         assign_public_ip: yes
+      with_items: "count={{ validator_count_instances }}"
       register:   ec2
     - name: Add new instance to host group
-      add_host: hostname={{ item.public_ip }} groupname=launched
-      with_items: "{{ ec2.instances }}"
+      add_host: hostname={{ item.instances[0].public_ip }} groupname=launched
+      with_items: "{{ ec2.results }}"
     - name: Wait for SSH to come up
-      wait_for: host={{ item.public_ip }} port=22 delay=90 timeout=320 state=started
-      with_items: "{{ ec2.instances }}"
+      wait_for: host={{ item.instances[0].public_ip }} port=22 delay=90 timeout=320 state=started
+      with_items: "{{ ec2.results }}"
       when: ec2.changed
   tags: validator