Skip to content

Commit

Permalink
Fix #228 bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Arsenii Petrovich committed Sep 18, 2019
1 parent 21d129f commit 3872b71
Show file tree
Hide file tree
Showing 19 changed files with 8 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ files/*.pub
*.retry

aws/group_vars/all.yml
*id_rsa*

group_vars/all.yml
group_vars/all
Expand Down
3 changes: 1 addition & 2 deletions aws/blockscout.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
raw: test -e /usr/bin/python || (sudo apt -y update && sudo apt install -y python-minimal)

- name: EC2 access setup
hosts: launched
become: False
hosts: localhost
roles:
- blockscout-access
5 changes: 2 additions & 3 deletions aws/bootnode.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
when: associate_bootnode_elastic_ip == true

- name: EC2 access setup
hosts: bootnode
become: True
hosts: localhost
roles:
- bootnode-access
- bootnode-access
3 changes: 1 addition & 2 deletions aws/explorer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
raw: test -e /usr/bin/python || (sudo apt -y update && sudo apt install -y python-minimal)

- name: EC2 access setup
hosts: explorer
become: True
hosts: localhost
roles:
- explorer-access
4 changes: 1 addition & 3 deletions aws/moc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
cidr_ip: 0.0.0.0/0
tags: moc


- name: Create moc
hosts: localhost
gather_facts: False
Expand Down Expand Up @@ -69,7 +68,6 @@
raw: test -e /usr/bin/python || (sudo apt -y update && sudo apt install -y python-minimal)

- name: EC2 access setup
hosts: moc
become: True
hosts: localhost
roles:
- moc-access
4 changes: 1 addition & 3 deletions aws/netstat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
cidr_ip: 0.0.0.0/0
tags: netstat


- name: Create netstat
hosts: localhost
gather_facts: False
Expand Down Expand Up @@ -69,7 +68,6 @@
raw: test -e /usr/bin/python || (sudo apt -y update && sudo apt install -y python-minimal)

- name: EC2 access setup
hosts: netstat
become: True
hosts: localhost
roles:
- netstat-access
3 changes: 0 additions & 3 deletions aws/roles/blockscout-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create blockscout security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down Expand Up @@ -72,7 +70,6 @@
when: allow_blockscout_p2p == true

- name: Add http-4000 access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/blockscout-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
4 changes: 0 additions & 4 deletions aws/roles/bootnode-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create bootnode security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -31,7 +29,6 @@
when: allow_bootnode_ssh == true

- name: Add https access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down Expand Up @@ -69,7 +66,6 @@


- name: Add p2p access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/bootnode-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
5 changes: 0 additions & 5 deletions aws/roles/explorer-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create explorer security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -31,7 +29,6 @@
when: allow_explorer_ssh == true

- name: Add https access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -48,7 +45,6 @@
cidr_ip: 0.0.0.0/0

- name: Add p2p access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -72,7 +68,6 @@
when: allow_explorer_p2p == true

- name: Add http-3000 access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/explorer-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
3 changes: 0 additions & 3 deletions aws/roles/moc-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create moc security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -31,7 +29,6 @@
when: allow_moc_ssh == true

- name: Add p2p access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/moc-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
4 changes: 0 additions & 4 deletions aws/roles/netstat-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create netstat security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -31,7 +29,6 @@
when: allow_netstat_ssh == true

- name: Add https access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -48,7 +45,6 @@
cidr_ip: 0.0.0.0/0

- name: Add http-3000 access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/netstat-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
3 changes: 0 additions & 3 deletions aws/roles/validator-access/tasks/ec2.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Create validator security group
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -11,7 +10,6 @@
vpc_id: "{{ vpc_id | default('') }}"

- name: Add ssh access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand All @@ -31,7 +29,6 @@
when: allow_validator_ssh == true

- name: Add p2p access
delegate_to: localhost
ec2_group:
ec2_access_key: "{{ access_key }}"
ec2_secret_key: "{{ secret_key }}"
Expand Down
1 change: 0 additions & 1 deletion aws/roles/validator-access/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: Setup EC2 firewall
import_tasks: ec2.yml
when: ansible_bios_version is search("amazon")
3 changes: 1 addition & 2 deletions aws/validator.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
when: associate_validator_elastic_ip == true

- name: EC2 access setup
hosts: validator
become: True
hosts: localhost
roles:
- validator-access

0 comments on commit 3872b71

Please sign in to comment.