fix: retry setting the computer title

landscape/client/deployment.py

@@ -2,6 +2,7 @@
 import os.path
 import subprocess
 import sys
+import time
 from datetime import datetime
 from datetime import timezone
 from optparse import SUPPRESS_HELP
@@ -198,7 +199,7 @@ def juju_filename(self):
         backwards-compatibility."""
         return os.path.join(self.data_path, "juju-info.json")
 
-    def auto_configure(self):
+    def auto_configure(self, retry=False, max_retries=5):
         """Automatically configure the client snap."""
         client_conf = snap_http.get_conf("landscape-client").result
         auto_enroll_conf = client_conf.get("auto-register", {})
@@ -208,14 +209,22 @@ def auto_configure(self):
         if not enabled or configured:
             return
 
-        title = generate_computer_title(auto_enroll_conf)
-        if title:
-            self.computer_title = title
-            self.write()
+        delay = 120
+        for _ in range(max_retries):
+            title = generate_computer_title(auto_enroll_conf)
+            if title:
+                self.computer_title = title
+                self.write()
 
-            auto_enroll_conf["configured"] = True
-            client_conf["auto-register"] = auto_enroll_conf
-            snap_http.set_conf("landscape-client", client_conf)
+                auto_enroll_conf["configured"] = True
+                client_conf["auto-register"] = auto_enroll_conf
+                snap_http.set_conf("landscape-client", client_conf)
+
+                break
+            elif retry:
+                # retry until we get the computer title
+                time.sleep(delay)
+                delay *= 2
 
 
 def get_versioned_persist(service):
@@ -243,11 +252,15 @@ def generate_computer_title(auto_enroll_config):
     snap_info = get_snap_info()
     wait_for_serial = auto_enroll_config.get("wait-for-serial-as", True)
     if "serial" not in snap_info and wait_for_serial:
+        logging.debug(
+            f"No serial assertion in snap info {snap_info}, waiting..."
+        )
         return
 
     hostname = get_fqdn()
     wait_for_hostname = auto_enroll_config.get("wait-for-hostname", False)
     if hostname == "localhost" and wait_for_hostname:
+        logging.debug("Waiting for hostname...")
         return
 
     nics = get_active_device_info(default_only=True)

landscape/client/watchdog.py

@@ -721,7 +721,7 @@ def run(args=sys.argv, reactor=None):
     init_logging(config, "watchdog")
 
     if IS_SNAP:
-        config.auto_configure()
+        config.auto_configure(retry=True)
 
     application = Application("landscape-client")
     watchdog_service = WatchDogService(config)