podman: revert to using default slirp4netns mtu

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

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index 6052b7fb2c3d7c1d6347219bb7966695f6f117f1..dac8ee1c40a7a05c046e1a3d7214a044b8720aaf 100644 (file)
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -25,6 +25,7 @@ property :service, String, :name_property => true
 property :description, String, :required => true
 property :image, String, :required => true
 property :ports, Hash
+property :environment, Hash, :default => {}
 
 action :create do
   systemd_service new_resource.service do
@@ -33,7 +34,7 @@ action :create do
     notify_access "all"
     environment "PODMAN_SYSTEMD_UNIT" => "%n"
     exec_start_pre "/bin/rm --force %t/%n.ctr-id"
-    exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --userns=auto --label=io.containers.autoupdate=registry --network=slirp4netns:mtu=1500 #{publish_options} --rm --sdnotify=conmon --detach --replace --name=%N #{new_resource.image}"
+    exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --userns=auto --label=io.containers.autoupdate=registry --pids-limit=-1 #{publish_options} #{environment_options} --rm --sdnotify=conmon --detach --replace --name=%N #{new_resource.image}"
     exec_stop "/usr/bin/podman stop --ignore --time=10 --cidfile=%t/%n.ctr-id"
     exec_stop_post "/usr/bin/podman rm --force --ignore --cidfile=%t/%n.ctr-id"
     timeout_start_sec 180
@@ -42,9 +43,12 @@ action :create do
   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
     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
@@ -70,4 +74,10 @@ action_class do
       "--publish=127.0.0.1:#{host}:#{guest}"
     end.join(" ")
   end
+
+  def environment_options
+    new_resource.environment.collect do |key, value|
+      "-e '#{key}=#{value}'"
+    end.join(" ")
+  end
 end