Drop support for old style tile server replication

[chef.git] / cookbooks / podman / resources / service.rb

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index 6ce5da35ee1a2601251cb30cd99770aeda76f5e9..b48e04ce1468511d24e917e49c94d044fe1d4f28 100644 (file)
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -41,9 +41,19 @@ action :create do
     restart "on-failure"
   end
 
+  # No action :start here to avoid a start and then immediate :restart, due to subscribe, on first run
+  # FIXME: Ubuntu 22.04 podman/crun bug workaround "retries"
   service new_resource.service do
-    action [:enable, :start]
-    subscribes :restart, "systemd_service[#{new_resource.service}]"
+    action :enable
+    subscribes :restart, "systemd_service[#{new_resource.service}]", :immediately
+    retries 4 # Workaround https://github.com/containers/podman/issues/9752
+    retry_delay 5
+  end
+
+  # Ensure the service is started if not running, replies on status of service resource
+  notify_group new_resource.service do
+    action :run
+    notifies :start, "service[#{new_resource.service}]", :immediately
   end
 end