Merge pull request #2155 from nicomiguelino/fix-splash-screen-ip

host_agent.py

@@ -12,6 +12,13 @@
 import os
 import redis
 import subprocess
+import requests
+from tenacity import (
+    Retrying,
+    RetryError,
+    stop_after_attempt,
+    wait_fixed,
+)
 
 
 REDIS_ARGS = dict(host="127.0.0.1", port=6379, db=0)
@@ -40,8 +47,26 @@ def get_ip_addresses():
 
 def set_ip_addresses():
     rdb = redis.Redis(**REDIS_ARGS)
-    ip_addresses = get_ip_addresses()
 
+    rdb.set('ip_addresses_ready', 'false')
+
+    try:
+        for attempt in Retrying(
+            stop=stop_after_attempt(10),
+            wait=wait_fixed(1),
+        ):
+            with attempt:
+                response = requests.get('https://1.1.1.1')
+                response.raise_for_status()
+    except RetryError:
+        logging.warning(
+            'Unable to connect to the Internet. '
+            'Proceeding with the current IP addresses available.'
+        )
+
+    rdb.set('ip_addresses_ready', 'true')
+
+    ip_addresses = get_ip_addresses()
     rdb.set('ip_addresses', json.dumps(ip_addresses))
 
 

lib/utils.py

@@ -21,6 +21,12 @@
 from platform import machine
 from settings import settings, ZmqPublisher
 from subprocess import check_output, call
+from tenacity import (
+    Retrying,
+    RetryError,
+    stop_after_attempt,
+    wait_fixed,
+)
 from threading import Thread
 from time import sleep
 from urllib.parse import urlparse
@@ -148,6 +154,28 @@ def get_node_ip():
             sleep(1)
 
         r.publish('hostcmd', 'set_ip_addresses')
+
+        try:
+            for attempt in Retrying(
+                stop=stop_after_attempt(20),
+                wait=wait_fixed(1),
+            ):
+                environment = getenv('ENVIRONMENT', None)
+                if environment in ['development', 'test']:
+                    break
+
+                with attempt:
+                    ip_addresses_ready = r.get('ip_addresses_ready') or 'false'
+                    if json.loads(ip_addresses_ready):
+                        break
+                    else:
+                        raise Exception(
+                            'Internet connection is not available.')
+        except RetryError:
+            logging.warning(
+                'Internet connection is not available. '
+            )
+
         ip_addresses = r.get('ip_addresses')
 
         if ip_addresses:

requirements/requirements.host.txt

@@ -4,3 +4,5 @@ ansible-core==2.15.9
 docker==6.0.0
 netifaces2==0.0.22
 redis==4.3.4
+requests[security]==2.32.3
+tenacity==9.0.0