[Infra] Fix node ansible playbook

Signed-off-by: Herklos <herklos@drakkar.software>

Author: Herklos

infra/node/ansible/roles/common/tasks/main.yml

@@ -1,4 +1,11 @@
 ---
+- name: Ensure deploy user exists
+  ansible.builtin.user:
+    name: deploy
+    system: true
+    create_home: false
+    shell: /usr/sbin/nologin
+
 - name: Check if Docker iptables chains are present
   ansible.builtin.command: iptables -L DOCKER-USER -n
   register: docker_chains

infra/node/ansible/roles/octobot/tasks/healthcheck.yml

@@ -12,15 +12,26 @@
   changed_when: false
   when: enable_replica_mode | default(false) | bool and is_master | default(false) | bool
 
-- name: Wait for OctoBot Node health
+- name: Wait for OctoBot Node API health
+  ansible.builtin.uri:
+    url: "http://127.0.0.1:{{ octobot_node_port }}/api/v1/openapi.json"
+    return_content: true
+    status_code: [200]
+  register: octobot_health
+  until: octobot_health.status == 200
+  retries: 60
+  delay: 5
+
+- name: Wait for OctoBot Web UI health
   ansible.builtin.uri:
     url: "http://127.0.0.1:{{ octobot_web_port }}"
     return_content: true
     status_code: [200, 302]
-  register: octobot_health
-  until: octobot_health.status in [200, 302]
-  retries: 30
+  register: web_health
+  until: web_health.status in [200, 302]
+  retries: 60
   delay: 5
+  when: expose_web_ui | default(false) | bool
 
 - name: Wait for Nginx health (proxied)
   ansible.builtin.uri:
@@ -31,4 +42,4 @@
   until: nginx_health.status == 200
   retries: 10
   delay: 5
-  when: enable_nginx | default(false)
+  when: enable_nginx | default(false) | bool

infra/node/ansible/roles/octobot/tasks/main.yml

@@ -27,7 +27,7 @@
     group: deploy
     mode: "0644"
   notify: restart nginx
-  when: enable_nginx | default(false)
+  when: enable_nginx | default(false) | bool
 
 - name: Copy Tor proxy Dockerfile
   ansible.builtin.copy:
@@ -37,7 +37,7 @@
     group: deploy
     mode: "0644"
   notify: restart tor
-  when: enable_tor | default(false)
+  when: enable_tor | default(false) | bool
 
 - name: Generate self-signed TLS certificate
   ansible.builtin.command:
@@ -48,11 +48,11 @@
       -subj "/CN={{ inventory_hostname | regex_replace('[^a-zA-Z0-9.\\-]', '') }}"
     creates: "{{ stack_deploy_dir }}/origin.crt"
   notify: restart nginx
-  when: enable_nginx | default(false)
+  when: enable_nginx | default(false) | bool
 
 - name: Pull Docker images
   ansible.builtin.command:
-    cmd: docker compose pull --ignore-buildable
+    cmd: docker compose pull --ignore-buildable --ignore-pull-failures
     chdir: "{{ stack_deploy_dir }}"
   changed_when: false
 

infra/node/ansible/roles/octobot/templates/env.j2

@@ -1,3 +1,6 @@
+# Node API (env var override for NodeApiService.get_is_enabled)
+ENABLE_NODE_API=true
+
 NODE_ENVIRONMENT=production
 IS_MASTER_MODE={{ 'true' if (is_master | default(false) | bool) else 'false' }}
 CONSUMER_ONLY={{ 'true' if (is_consumer_only | default(false) | bool) else 'false' }}

packages/services/octobot_services/constants.py

@@ -72,6 +72,7 @@
 CONFIG_NODE_API_PORT = "port"
 ENV_NODE_API_PORT = "NODE_API_PORT"
 ENV_NODE_API_ADDRESS = "NODE_API_ADDRESS"
+ENV_ENABLE_NODE_API = "ENABLE_NODE_API"
 DEFAULT_NODE_API_IP = DEFAULT_SERVER_IP
 DEFAULT_NODE_API_PORT = 8000
 

packages/tentacles/Services/Services_bases/node_api_service/node_api.py

@@ -75,7 +75,10 @@ def is_setup_correctly(config):
 
     @staticmethod
     def get_is_enabled(config):
-        # allow to disable node api interface from config, enabled by default otherwise
+        if os.getenv(services_constants.ENV_ENABLE_NODE_API):
+            return commons_constants.parse_boolean_environment_var(
+                services_constants.ENV_ENABLE_NODE_API, "false"
+            )
         return config.get(services_constants.CONFIG_CATEGORY_SERVICES, {}).get(services_constants.CONFIG_NODE_API, {}).get(
             commons_constants.CONFIG_ENABLED_OPTION, False
         )