fix lack of data folder creation, add flags specific to waku v2

Signed-off-by: Jakub Sokołowski <jakub@status.im>

ansible/roles/nim-waku/defaults/main.yml

@@ -4,15 +4,15 @@ nim_waku_cont_image: 'statusteam/nim-waku:{{ nim_waku_cont_tag }}'
 nim_waku_cont_name: 'nim-waku'
 nim_waku_cont_vol: '/docker/{{ nim_waku_cont_name }}'
 
+# Node database path
+nim_waku_node_db_path: '{{ nim_waku_cont_vol }}/data'
+
 # Value for private node key which is used to create public enode key
 nim_waku_node_key: ~
 # Node key needs to be a 64 char hexadecimal string, used if not provided
 nim_waku_random_node_key: '{{ ansible_date_time.epoch | random | hash("sha256") }}'
 nim_waku_node_key_file_path: '{{ nim_waku_cont_vol }}/nodekey'
 
-# Node database path
-nim_waku_node_db_path: '{{ nim_waku_cont_vol }}/data'
-
 # WARNING: Enabling this will disable relaying of messages
 nim_waku_light_node_enabled: false
 

ansible/roles/nim-waku/tasks/compose.yml

@@ -24,24 +24,29 @@
               max_attempts: '{{ nim_waku_restart_max_attempts }}'
               delay: '{{ nim_waku_restart_delay_sec }}s'
               window: '{{ nim_waku_restart_window_sec }}s'
-         volumes:
+          volumes:
             - '{{ nim_waku_node_db_path }}:/data'
           ports:
             - '127.0.0.1:{{ nim_waku_rpc_tcp_port }}:{{ nim_waku_rpc_tcp_port }}/tcp'
             - '{{ nim_waku_p2p_tcp_port }}:{{ nim_waku_p2p_tcp_port }}/tcp'
             - '{{ nim_waku_p2p_udp_port }}:{{ nim_waku_p2p_udp_port }}/udp'
             - '{{ nim_waku_metrics_port }}:{{ nim_waku_metrics_port }}/tcp'
-          command:
-            - '--fleet={{ nim_waku_bootstrap_fleet }}'
-            - '--nodekey={{ nim_waku_node_key | mandatory }}'
-            - '--nat=extip:{{ nim_waku_public_address }}'
-            - '--log-level={{ nim_waku_log_level }}'
-            - '--rpc-port={{ nim_waku_rpc_tcp_port }}'
-            - '--rpc-address=0.0.0.0'
-            - '--tcp-port={{ nim_waku_p2p_tcp_port }}'
-            - '--udp-port={{ nim_waku_p2p_udp_port }}'
-            - '--discovery={{ nim_waku_discovery_enabled }}'
-            - '--metrics-server={{ nim_waku_metrics_enabled }}'
-            - '--metrics-server-port={{ nim_waku_metrics_port }}'
-            - '--metrics-server-address=0.0.0.0'
-            - '--dbpath:/data'
+          command: |
+            {% if nim_waku_cont_tag == "wakunode2" %}
+            --store=true
+            --relay=true
+            --filter=true
+            --dbpath=/data
+            {% else %}
+            --discovery={{ nim_waku_discovery_enabled }}
+            {% endif %}
+            --nodekey={{ nim_waku_node_key | mandatory }}
+            --nat=extip:{{ nim_waku_public_address }}
+            --log-level={{ nim_waku_log_level }}
+            --rpc-port={{ nim_waku_rpc_tcp_port }}
+            --rpc-address=0.0.0.0
+            --tcp-port={{ nim_waku_p2p_tcp_port }}
+            --udp-port={{ nim_waku_p2p_udp_port }}
+            --metrics-server={{ nim_waku_metrics_enabled }}
+            --metrics-server-port={{ nim_waku_metrics_port }}
+            --metrics-server-address=0.0.0.0

ansible/roles/nim-waku/tasks/container.yml

@@ -1,4 +1,12 @@
 ---
+- name: 'Create data folder'
+  file:
+    dest: '{{ nim_waku_node_db_path }}'
+    state: 'directory'
+    owner: dockremap
+    group: docker
+    mode: 0775
+
 - name: 'Create compose file: {{ nim_waku_cont_name }}'
   copy:
     dest: '{{ nim_waku_cont_vol }}/docker-compose.yml'

ansible/roles/nim-waku/tasks/main.yml

@@ -1,7 +1,6 @@
 ---
 - import_tasks: install.yml
 - import_tasks: nodekey.yml
-- import_tasks: db.yml
 - import_tasks: compose.yml
 - import_tasks: container.yml
 - import_tasks: consul.yml