Merge pull request #184 from ArseniiPetrovich/fixdefaultsvpc

Fix defaults in EC2 creation (176 issue)
This commit is contained in:
phahulin 2018-11-26 21:29:51 +03:00 committed by GitHub
commit aac31c93f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 140 deletions

View File

@ -12,17 +12,12 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
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
@ -49,7 +44,7 @@
count: "{{ bootnode_count_instances }}"
wait: yes
region: "{{ region }}"
vpc_subnet_id: "{{ vpc_subnet_id }}"
vpc_subnet_id: "{{ vpc_subnet_id | default('') }}"
volumes: "{{ volumes }}"
assign_public_ip: yes
register: ec2

View File

@ -12,17 +12,12 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
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
@ -49,7 +44,7 @@
count: "{{ explorer_count_instances }}"
wait: yes
region: "{{ region }}"
vpc_subnet_id: "{{ vpc_subnet_id }}"
vpc_subnet_id: "{{ vpc_subnet_id | default('') }}"
volumes: "{{ volumes }}"
assign_public_ip: yes
register: ec2

View File

@ -12,17 +12,12 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
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
@ -49,7 +44,7 @@
count: "{{ moc_count_instances }}"
wait: yes
region: "{{ region }}"
vpc_subnet_id: "{{ vpc_subnet_id }}"
vpc_subnet_id: "{{ vpc_subnet_id | default('') }}"
volumes: "{{ volumes }}"
assign_public_ip: yes
register: ec2

View File

@ -12,17 +12,12 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
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
@ -49,7 +44,7 @@
count: "{{ netstat_count_instances }}"
wait: yes
region: "{{ region }}"
vpc_subnet_id: "{{ vpc_subnet_id }}"
vpc_subnet_id: "{{ vpc_subnet_id | default('') }}"
volumes: "{{ volumes }}"
assign_public_ip: yes
register: ec2

View File

@ -8,24 +8,7 @@
description: "Default security group"
region: "{{ region }}"
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
vpc_id: "{{ vpc_id | default('') }}"
- name: Add ssh access
delegate_to: localhost
@ -37,7 +20,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -57,7 +40,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: 443
@ -74,7 +57,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -95,7 +78,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"

View File

@ -8,24 +8,7 @@
description: "Default security group"
region: "{{ region }}"
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
vpc_id: "{{ vpc_id | default('') }}"
- name: Add ssh access
delegate_to: localhost
@ -37,7 +20,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -57,7 +40,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: 443
@ -74,7 +57,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -98,7 +81,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"

View File

@ -8,24 +8,7 @@
description: "Default security group"
region: "{{ region }}"
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
vpc_id: "{{ vpc_id | default('') }}"
- name: Add ssh access
delegate_to: localhost
@ -37,7 +20,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -57,7 +40,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"

View File

@ -8,24 +8,7 @@
description: "Default security group"
region: "{{ region }}"
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
vpc_id: "{{ vpc_id | default('') }}"
- name: Add ssh access
delegate_to: localhost
@ -37,7 +20,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -57,7 +40,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: 443
@ -74,7 +57,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"

View File

@ -8,24 +8,7 @@
description: "Default security group"
region: "{{ region }}"
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
vpc_id: "{{ vpc_id | default('') }}"
- name: Add ssh access
delegate_to: localhost
@ -37,7 +20,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"
@ -57,7 +40,7 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
from_port: "{{ item }}"

View File

@ -12,17 +12,12 @@
region: "{{ region }}"
purge_rules_egress: false
purge_rules: false
vpc_id: "{{ vpc_id }}"
vpc_id: "{{ vpc_id | default('') }}"
rules:
- proto: tcp
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
@ -49,7 +44,7 @@
count: "{{ validator_count_instances }}"
wait: yes
region: "{{ region }}"
vpc_subnet_id: "{{ vpc_subnet_id }}"
vpc_subnet_id: "{{ vpc_subnet_id | default('') }}"
volumes: "{{ volumes }}"
assign_public_ip: yes
register: ec2