Browse Source

simplify quadlet role

Blaine Story 1 day ago
parent
commit
9b24aee3e1
1 changed files with 6 additions and 64 deletions
  1. 6 64
      roles/quadlet/tasks/main.yml

+ 6 - 64
roles/quadlet/tasks/main.yml

@@ -36,61 +36,17 @@
     label: "{{ item }}"
 
 
-- name: Create quadlet file for podman networks
-  containers.podman.podman_network:
-    name: "{{ item.name }}"
-    state: quadlet
-    quadlet_options:
-      - |
-        [Install]
-        WantedBy=default.target
-
-  notify:
-    - Daemon Reload
-  with_items:
-    - "{{ container_networks }}"
-  when:
-    - container_networks is defined
-  loop_control:
-    label: "{{ item.name }}"
-
-
-- name: Flush Handlers
-  meta: flush_handlers
-
-
-- name: Start Podman Networks
-  ansible.builtin.systemd_service:
-    name: "{{ item.name }}-network"
-    state: started
-  with_items:
-    - "{{ container_networks }}"
-  when:
-    - container_networks is defined
-  loop_control:
-    label: "{{ item.name }}"
-
-
-- name: Create quadlet .pod files
-  containers.podman.podman_pod:
-    name: "{{ item.name }}"
-    state: quadlet
-    ports: "{{ item.ports | default(omit) }}"
-  with_items:
-    - "{{ containers }}"
-  when:
-    - containers is defined
-  loop_control:
-    label: "{{ item.name }}"
-  notify:
-    - Daemon Reload
-
-
 - name: Create quadlet .container files
   containers.podman.podman_container:
     name: "{{ item.name }}"
     state: quadlet
     image: "{{ item.image }}"
+    generate_systemd:
+      names: True
+      after: "{{ item.after | default(omit) }}"
+      restart_sec: "{{ item.restart_sec | default(omit) }}"
+      requires: "{{ item.requires | default(omit) }}"
+      restart_policy: "{{ item.restart_policy | default(omit) }}"
     privileged: "{{ item.privileged | default(omit) }}"
     network: "{{ item.networks | default(omit) }}"
     env: "{{ item.environment | default(omit) }}"
@@ -105,7 +61,6 @@
         [Install]
         WantedBy=default.target
         {{ item.quadlet_options | default('') }}
-
   with_items:
     - "{{ containers }}"
   when:
@@ -118,16 +73,3 @@
 
 - name: Flush handlers
   meta: flush_handlers
-
-
-# Containers are automatically enabled via WantedBy=default.target entries
-- name: Start Container Services
-  ansible.builtin.systemd_service:
-    name: "{{ item.name }}"
-    state: started
-  with_items:
-    - "{{ containers }}"
-  when:
-    - containers is defined
-  loop_control:
-    label: "{{ item.name }}"