add public IP as public address

rotkonetworks · Nov 28, 2023 · 84446d0 · 84446d0
1 parent ff8250c
commit 84446d0
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 7 deletions.
diff --git a/playbooks/networkid_pk_backup.yaml b/playbooks/networkid_pk_backup.yaml
@@ -16,19 +16,24 @@
       ansible.builtin.set_fact:
         subdomain: "{{ inventory_hostname.split('.')[0] }}"
 
-    - name: Get networkid from logs
+    - name: Collect networkid and external addresses from logs
       become: True
       become_user: root
       ansible.builtin.shell: |
-        /bin/bash -c "set -o pipefail; journalctl -u {{ default_service }} -n 100000 | grep 'Local node identity is:' | tail -1 | awk '{print \$NF}'"
-      register: networkid
+        /bin/bash -c "set -o pipefail; journalctl -u {{ default_service }} -n 100000 | tee >(grep 'Local node identity is:' | tail -1 | awk '{print \$NF}' > /tmp/networkid.txt) | grep 'Discovered new external address for our node:'"
+      register: external_addresses_logs
       ignore_errors: True
       when: network_dir.matched > 0
 
-    - name: Print networkid
+    - name: Read networkid from temporary file
+      ansible.builtin.command: cat /tmp/networkid.txt
+      register: networkid
+      when: network_dir.matched > 0
+
+    - name: Print external addresses in JSON format without duplicates
       ansible.builtin.debug:
-        msg: "Network ID: {{ networkid.stdout | trim }}"
-      when: network_dir.matched > 0 and networkid.stdout
+        msg: "{{ external_addresses_logs.stdout_lines | map('regex_search', '(?<=node: ).*') | select('string') | unique | sort | to_nice_json }}"
+      when: external_addresses_logs.stdout_lines | length > 0 and network_dir.matched > 0
 
     - name: Backup secrets from servers to local storage
       become: True
@@ -37,6 +42,6 @@
         src: "{{ network_dir.files[0].path }}/network/secret_ed25519"
         dest: "/opt/backup/{{ subdomain }}_{{ networkid.stdout | trim }}_secret_ed25519"
         flat: yes
-      when: network_dir.matched > 0 and networkid.stdout
+      when: network_dir.matched > 0 and networkid.stdout != ""
       tags: backup
 ...
diff --git a/playbooks/nginx.yaml b/playbooks/nginx.yaml
@@ -0,0 +1,8 @@
+# Standards: 0.2
+---
+- name: Default tools and configurations
+  hosts: polkadot,cumulus,encointer
+  gather_facts: True
+  roles:
+    - setup_install_nginx
+...
diff --git a/playbooks/test.yaml b/playbooks/test.yaml
@@ -0,0 +1,14 @@
+# Standards: 0.2
+---
+- name: Default tools and configurations
+  hosts: proxmox_nodes
+  gather_facts: True
+  roles:
+    - setup_set_default_locale
+    - setup_set_timezone
+    - setup_install_basic_tools
+    - setup_ansible_facts
+    - setup_add_node_role
+    - setup_user_management
+    - setup_log_rotation
+...
diff --git a/roles/setup_install_cumulus/templates/cumulus_bootnode.service.j2 b/roles/setup_install_cumulus/templates/cumulus_bootnode.service.j2
@@ -17,6 +17,8 @@ ExecStart={{ default_base_path }}/cumulus \
   --telemetry-url 'wss://telemetry.polkadot.io/submit/ 1' \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_cumulus/templates/cumulus_collator.service.j2 b/roles/setup_install_cumulus/templates/cumulus_collator.service.j2
@@ -23,6 +23,8 @@ ExecStart={{ default_base_path }}/cumulus \
      --port {{ default_p2p_port }} \
      --rpc-port {{ default_rpc_port }} \
      --prometheus-port {{ default_prom_port }} \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
      --relay-chain-rpc-urls {{ default_relay_rpc }} {{ default_relay_rpc_fallback }} \
      --execution wasm \
      --wasm-execution compiled \

diff --git a/roles/setup_install_cumulus/templates/cumulus_endpoint.service.j2 b/roles/setup_install_cumulus/templates/cumulus_endpoint.service.j2
@@ -14,6 +14,8 @@ ExecStart={{ default_base_path }}/cumulus \
   --sync full \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_encointer/templates/encointer_bootnode.service.j2 b/roles/setup_install_encointer/templates/encointer_bootnode.service.j2
@@ -17,6 +17,8 @@ ExecStart={{ default_base_path }}/encointer \
   --telemetry-url 'wss://telemetry.polkadot.io/submit/ 1' \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_encointer/templates/encointer_collator.service.j2 b/roles/setup_install_encointer/templates/encointer_collator.service.j2
@@ -23,6 +23,8 @@ ExecStart={{ default_base_path }}/encointer \
      --port {{ default_p2p_port }} \
      --rpc-port {{ default_rpc_port }} \
      --prometheus-port {{ default_prom_port }} \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
      --relay-chain-rpc-urls {{ default_relay_rpc }} {{ default_relay_rpc_fallback }} \
      --execution wasm \
      --wasm-execution compiled \

diff --git a/roles/setup_install_encointer/templates/encointer_endpoint.service.j2 b/roles/setup_install_encointer/templates/encointer_endpoint.service.j2
@@ -14,6 +14,8 @@ ExecStart={{ default_base_path }}/encointer \
   --sync full \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_polkadot/templates/polkadot_bootnode.service.j2 b/roles/setup_install_polkadot/templates/polkadot_bootnode.service.j2
@@ -17,6 +17,8 @@ ExecStart={{ default_base_path }}/polkadot \
   --telemetry-url 'wss://telemetry.polkadot.io/submit/ 1' \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_polkadot/templates/polkadot_endpoint.service.j2 b/roles/setup_install_polkadot/templates/polkadot_endpoint.service.j2
@@ -15,6 +15,8 @@ ExecStart={{ default_base_path }}/polkadot \
   --sync full \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
   --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+  --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port }} \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_ws }}/ws \
   --public-addr /dns/{{ default_public_dns }}/tcp/{{ default_p2p_port_wss }}/wss \

diff --git a/roles/setup_install_polkadot/templates/polkadot_validator.service.j2 b/roles/setup_install_polkadot/templates/polkadot_validator.service.j2
@@ -22,6 +22,10 @@ ExecStart={{ default_base_path }}/polkadot \
      --telemetry-url 'wss://telemetry-backend.w3f.community/submit 1' \
      --port {{ default_p2p_port }} \
      --rpc-port {{ default_rpc_port }} \
+     --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port }} \
+     --listen-addr /ip4/0.0.0.0/tcp/{{ default_p2p_port_ws }}/ws \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port }} \
+     --public-addr /ip4/{{ ansible_host }}/tcp/{{ default_p2p_port_ws }}/ws \
      --prometheus-port {{ default_prom_port }} \
      --wasm-execution compiled \
      --pruning 1000 \