Merge remote-tracking branch 'github/pull/704'

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

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index a6013e3855e843cfc7a36b1ad51eba67c8ef5824..5ef0b5885f2d90476fc75103ed86572ae2d32d97 100644 (file)
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -24,7 +24,9 @@ default_action :create
 property :service, String, :name_property => true
 property :description, String, :required => true
 property :image, String, :required => true
 property :service, String, :name_property => true
 property :description, String, :required => true
 property :image, String, :required => true

-property :ports, Hash
+property :ports, Hash, :default => {}
+property :environment, Hash, :default => {}
+property :volume, Hash, :default => {}

 
 action :create do
   systemd_service new_resource.service do
 
 action :create do
   systemd_service new_resource.service do


@@ -33,16 +35,27 @@ action :create do
     notify_access "all"
     environment "PODMAN_SYSTEMD_UNIT" => "%n"
     exec_start_pre "/bin/rm --force %t/%n.ctr-id"
     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} #{volume_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"
     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

     timeout_stop_sec 70
     restart "on-failure"
   end
 
     timeout_stop_sec 70
     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
   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
 
   end
 end
 


@@ -62,4 +75,16 @@ action_class do
       "--publish=127.0.0.1:#{host}:#{guest}"
     end.join(" ")
   end
       "--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
+
+  def volume_options
+    new_resource.volume.collect do |key, value|
+      "-v '#{key}:#{value}'"
+    end.join(" ")
+  end

 end
 end