From dbe0512b05871a37ed80b7fa7bc34e24849b0736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 10 Mar 2022 17:23:49 +0100 Subject: [PATCH] use infra-role-waku-peers to connect peers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The logic was extracted to a separate role and Python script: - https://github.com/status-im/infra-role-waku-peers - https://github.com/status-im/infra-repos/commit/f3084d4e - https://github.com/status-im/infra-role-nim-waku/commit/b8b64c0e - https://github.com/status-im/infra-status/issues/4 Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nim-waku-connect.yml | 4 ++++ ansible/main.yml | 13 +++++++------ ansible/requirements.yml | 11 ++++++++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ansible/group_vars/nim-waku-connect.yml b/ansible/group_vars/nim-waku-connect.yml index 85ce8b6..784d411 100644 --- a/ansible/group_vars/nim-waku-connect.yml +++ b/ansible/group_vars/nim-waku-connect.yml @@ -26,6 +26,10 @@ nim_waku_websocket_ssl_dir: '/etc/letsencrypt' nim_waku_websocket_ssl_cert: '/etc/letsencrypt/live/{{ nim_waku_websocket_domain }}/fullchain.pem' nim_waku_websocket_ssl_key: '/etc/letsencrypt/live/{{ nim_waku_websocket_domain }}/privkey.pem' +# Peer connecting +nim_waku_connect_consul_service_names: ['{{ nim_waku_cont_name }}'] +nim_waku_connect_rpc_port: '{{ nim_waku_rpc_tcp_port }}' + # LetsEncrypt via Certbot certbot_admin_email: 'devops@status.im' certbot_docker_enabled: true diff --git a/ansible/main.yml b/ansible/main.yml index 8404f2a..295f172 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -14,15 +14,16 @@ - nim-waku-connect roles: - { role: open-ports, tags: open-ports } - - { role: swap-file, tags: swap-file } - - { role: certbot, tags: certbot } - - { role: nim-waku, tags: nim-waku } + - { role: swap-file, tags: swap-file } + - { role: certbot, tags: certbot } + - { role: nim-waku, tags: nim-waku } + - { role: waku-peers, tags: waku-peers } - name: Configure Go-Waku Nodes hosts: - go-waku-connect roles: - { role: open-ports, tags: open-ports } - - { role: swap-file, tags: swap-file } - - { role: certbot, tags: certbot } - - { role: go-waku, tags: go-waku } + - { role: swap-file, tags: swap-file } + - { role: certbot, tags: certbot } + - { role: go-waku, tags: go-waku } diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 602a0d0..07daade 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -11,12 +11,12 @@ - name: infra-role-bootstrap-linux src: git@github.com:status-im/infra-role-bootstrap-linux.git - version: 63998e7c92ed2db1dc1522e0bd5ca398c5434e5c + version: 40abcc62b18ac5127866c9c413491a7b92451cac scm: git - name: infra-role-wireguard src: git@github.com:status-im/infra-role-wireguard.git - version: 56d92683bda23f75228cc4ac93b5fae47adbabeb + version: b711bbabd2dc3d9ce8b1c3a6e5bc785901db9d09 scm: git - name: consul-service @@ -31,10 +31,15 @@ - name: nim-waku src: git@github.com:status-im/infra-role-nim-waku.git - version: a66b80766b752800c0ffd13eabe5bd3e4931c020 + version: b8b64c0e9796c762db2eaabd081c505db590e8a8 scm: git - name: go-waku src: git@github.com:status-im/infra-role-go-waku.git version: 90ff75700534d997a8ed1482ab3fea4687922d39 scm: git + +- name: waku-peers + src: git@github.com:status-im/infra-role-waku-peers.git + version: 8d002863097830316d2f9a2aa64a5f2cf974ed3a + scm: git