Fix #228 bug

.gitignore

@@ -2,6 +2,7 @@ files/*.pub
 *.retry
 
 aws/group_vars/all.yml
+*id_rsa*
 
 group_vars/all.yml
 group_vars/all

aws/blockscout.yml

@@ -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

aws/bootnode.yml

@@ -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

aws/explorer.yml

@@ -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

aws/moc.yml

@@ -20,7 +20,6 @@
           cidr_ip: 0.0.0.0/0
   tags: moc
 
-
 - name: Create moc
   hosts: localhost
   gather_facts: False
@@ -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

aws/netstat.yml

@@ -20,7 +20,6 @@
           cidr_ip: 0.0.0.0/0
   tags: netstat
 
-
 - name: Create netstat
   hosts: localhost
   gather_facts: False
@@ -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

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

@@ -1,6 +1,5 @@
 ---
 - name: Create blockscout security group
-  delegate_to: localhost
   ec2_group:
     ec2_access_key: "{{ access_key }}"
     ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"

aws/roles/blockscout-access/tasks/main.yml

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

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

@@ -1,6 +1,5 @@
 ---
 - name: Create bootnode security group
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"
@@ -69,7 +66,6 @@
 
 
 - name: Add p2p access
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"

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

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

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

@@ -1,6 +1,5 @@
 ---
 - name: Create explorer security group
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"
@@ -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 }}"
@@ -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 }}"

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

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

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

@@ -1,6 +1,5 @@
 ---
 - name: Create moc security group
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"

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

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

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

@@ -1,6 +1,5 @@
 ---
 - name: Create netstat security group
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"
@@ -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 }}"

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

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

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

@@ -1,6 +1,5 @@
 ---
 - name: Create validator security group
-  delegate_to: localhost
   ec2_group:
       ec2_access_key: "{{ access_key }}"
       ec2_secret_key: "{{ secret_key }}"
@@ -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 }}"
@@ -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 }}"

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

@@ -1,4 +1,3 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version is search("amazon")

aws/validator.yml

@@ -88,7 +88,6 @@
       when: associate_validator_elastic_ip == true
 
 - name: EC2 access setup
-  hosts: validator
-  become: True
+  hosts: localhost
   roles:
     - validator-access