From f34a5057eaa91d2faaf4efbf32f07df9decb43ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 26 Jun 2023 13:27:00 +0200 Subject: [PATCH] bridge: drop hosts as no long unnecessary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hanno has looked at the logs and decide they are no longer useful. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/bridge.yml | 26 -------------------------- ansible/group_vars/status.yml | 2 -- ansible/inventory/prod | 6 ------ ansible/inventory/test | 6 ------ ansible/main.yml | 7 ------- bridge.tf | 20 -------------------- 6 files changed, 67 deletions(-) delete mode 100644 ansible/group_vars/bridge.yml delete mode 100644 bridge.tf diff --git a/ansible/group_vars/bridge.yml b/ansible/group_vars/bridge.yml deleted file mode 100644 index 139dc8c..0000000 --- a/ansible/group_vars/bridge.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -nim_waku_bridge_service_name: 'nim-waku-bridge' -nim_waku_bridge_cont_tag: 'deploy-bridge-{{ stage }}' -nim_waku_bridge_log_level: 'info' -nim_waku_bridge_v1_fleet_name: '{{ stage }}' - -# Ports -nim_waku_bridge_libp2p_port: 9000 -nim_waku_bridge_devp2p_port: 30303 -nim_waku_bridge_metrics_port: 8008 -nim_waku_bridge_rpc_tcp_port: 8545 - -# Node Keys -nim_waku_bridge_nodekey_v1: '{{lookup("bitwarden", "fleets/status/"+stage+"/bridge/nodekey", field="v1")}}' -nim_waku_bridge_nodekey_v2: '{{lookup("bitwarden", "fleets/status/"+stage+"/bridge/nodekey", field="v2")}}' - -# Open LibP2P Ports -open_ports_default_comment: '{{ nim_waku_bridge_service_name }}' -open_ports_default_protocol: 'tcp' -open_ports_default_chain: 'SERVICES' -open_ports_list: - - { port: '{{ nim_waku_bridge_libp2p_port }}' } - - { port: '{{ nim_waku_bridge_devp2p_port }}' } - - { port: '{{ nim_waku_bridge_metrics_port }}', chain: 'VPN', ipset: 'metrics.hq' } - - { port: '{{ nim_waku_bridge_rpc_tcp_port }}', chain: 'VPN', ipset: '{{ env }}.{{ stage }}' } - diff --git a/ansible/group_vars/status.yml b/ansible/group_vars/status.yml index 845aa51..daf28c7 100644 --- a/ansible/group_vars/status.yml +++ b/ansible/group_vars/status.yml @@ -49,8 +49,6 @@ waku_peers_rpc_timeout: 20 waku_peers_rpc_retries: 5 waku_peers_consul_services: - { name: '{{ nim_waku_cont_name }}', env: '{{ env }}', stage: '{{ stage }}' } - # Temporarily disabled bridge. https://github.com/status-im/infra-status/issues/14 - #- { name: 'nim-waku-bridge', env: '{{ env }}', stage: '{{ stage }}' } # LetsEncrypt via Certbot certbot_docker_enabled: true diff --git a/ansible/inventory/prod b/ansible/inventory/prod index ea67a71..6e6f5a6 100644 --- a/ansible/inventory/prod +++ b/ansible/inventory/prod @@ -1,7 +1,6 @@ # NOTE: This file is generated by terraform.py # For emergency use when Consul fails [all] -bridge-01.do-ams3.status.prod hostname=bridge-01.do-ams3.status.prod ansible_host=161.35.244.35 env=status stage=prod data_center=do-ams3 region=ams3 dns_entry=bridge-01.do-ams3.status.prod.statusim.net node-01.ac-cn-hongkong-c.status.prod hostname=node-01.ac-cn-hongkong-c.status.prod ansible_host=47.242.202.59 env=status stage=prod data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=node-01.ac-cn-hongkong-c.status.prod.statusim.net node-01.do-ams3.status.prod hostname=node-01.do-ams3.status.prod ansible_host=143.198.249.174 env=status stage=prod data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.status.prod.statusim.net node-01.gc-us-central1-a.status.prod hostname=node-01.gc-us-central1-a.status.prod ansible_host=35.202.55.153 env=status stage=prod data_center=gc-us-central1-a region=us-central1-a dns_entry=node-01.gc-us-central1-a.status.prod.statusim.net @@ -13,11 +12,7 @@ node-02.gc-us-central1-a.status.prod hostname=node-02.gc-us-central1-a.status.pr node-01.ac-cn-hongkong-c.status.prod node-02.ac-cn-hongkong-c.status.prod -[bridge] -bridge-01.do-ams3.status.prod - [do-ams3] -bridge-01.do-ams3.status.prod node-01.do-ams3.status.prod node-02.do-ams3.status.prod @@ -34,7 +29,6 @@ node-02.do-ams3.status.prod node-02.gc-us-central1-a.status.prod [status.prod] -bridge-01.do-ams3.status.prod node-01.ac-cn-hongkong-c.status.prod node-01.do-ams3.status.prod node-01.gc-us-central1-a.status.prod diff --git a/ansible/inventory/test b/ansible/inventory/test index 22cb428..86a4afd 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -1,7 +1,6 @@ # NOTE: This file is generated by terraform.py # For emergency use when Consul fails [all] -bridge-01.do-ams3.status.test hostname=bridge-01.do-ams3.status.test ansible_host=134.209.133.76 env=status stage=test data_center=do-ams3 region=ams3 dns_entry=bridge-01.do-ams3.status.test.statusim.net node-01.ac-cn-hongkong-c.status.test hostname=node-01.ac-cn-hongkong-c.status.test ansible_host=47.242.233.36 env=status stage=test data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=node-01.ac-cn-hongkong-c.status.test.statusim.net node-01.do-ams3.status.test hostname=node-01.do-ams3.status.test ansible_host=64.225.81.237 env=status stage=test data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.status.test.statusim.net node-01.gc-us-central1-a.status.test hostname=node-01.gc-us-central1-a.status.test ansible_host=34.122.252.118 env=status stage=test data_center=gc-us-central1-a region=us-central1-a dns_entry=node-01.gc-us-central1-a.status.test.statusim.net @@ -9,11 +8,7 @@ node-01.gc-us-central1-a.status.test hostname=node-01.gc-us-central1-a.status.te [ac-cn-hongkong-c] node-01.ac-cn-hongkong-c.status.test -[bridge] -bridge-01.do-ams3.status.test - [do-ams3] -bridge-01.do-ams3.status.test node-01.do-ams3.status.test [gc-us-central1-a] @@ -25,7 +20,6 @@ node-01.do-ams3.status.test node-01.gc-us-central1-a.status.test [status.test] -bridge-01.do-ams3.status.test node-01.ac-cn-hongkong-c.status.test node-01.do-ams3.status.test node-01.gc-us-central1-a.status.test diff --git a/ansible/main.yml b/ansible/main.yml index 3a1cb9c..74772f7 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -9,13 +9,6 @@ - local_action: command ./versioncheck.py changed_when: false -- name: Configure Waku V1-V2 bridge - hosts: bridge - roles: - - { role: open-ports, tags: open-ports } - - { role: swap-file, tags: swap-file } - - { role: nim-waku-bridge, tags: nim-waku-bridge } - - name: Configure Waku Nodes hosts: status serial: '{{ serial|default(3) }}' diff --git a/bridge.tf b/bridge.tf deleted file mode 100644 index 218d4a8..0000000 --- a/bridge.tf +++ /dev/null @@ -1,20 +0,0 @@ -module "bridge" { - source = "github.com/status-im/infra-tf-digital-ocean" - - /* node type */ - name = "bridge" - group = "bridge" - env = local.ws.env - stage = local.ws.stage - domain = var.domain - - /* scaling */ - host_count = 1 - type = "s-1vcpu-2gb" - - /* firewall */ - open_tcp_ports = [ - "9000", /* libp2p */ - "30303", /* devp2p */ - ] -}