Merge branch 'main' of ssh://git.valid.dk:2222/daniel/ansible-podman

This commit is contained in:
Daniel Akulenok
2026-02-18 11:45:04 +01:00
3 changed files with 17 additions and 18 deletions

View File

@@ -379,4 +379,4 @@ MIT
## 👤 Author ## 👤 Author
Daniel Akulenok <podman@valid.dk> Daniel Akulenok <ansible-podman@valid.dk>

View File

@@ -50,7 +50,7 @@ podman_policy_trusted_registries:
# Registry configuration # Registry configuration
insecure: false insecure: false
blocked: false blocked: false
unqualified_search: false # Don't search library namespace for unqualified images unqualified_search: false # Don't search library namespace for unqualified images
# Docker Hub (all namespaces) - use with caution in production # Docker Hub (all namespaces) - use with caution in production
- registry: "docker.io" - registry: "docker.io"
@@ -58,7 +58,7 @@ podman_policy_trusted_registries:
# Registry configuration # Registry configuration
insecure: false insecure: false
blocked: false blocked: false
unqualified_search: true # Primary search registry unqualified_search: true # Primary search registry
# Red Hat's official registry # Red Hat's official registry
- registry: "registry.redhat.io" - registry: "registry.redhat.io"
@@ -101,7 +101,7 @@ podman_policy_trusted_registries:
# Registry configuration # Registry configuration
insecure: false insecure: false
blocked: false blocked: false
unqualified_search: false # Not commonly used for unqualified searches unqualified_search: false # Not commonly used for unqualified searches
# GitHub Container Registry # GitHub Container Registry
- registry: "ghcr.io" - registry: "ghcr.io"
@@ -109,7 +109,7 @@ podman_policy_trusted_registries:
# Registry configuration # Registry configuration
insecure: false insecure: false
blocked: false blocked: false
unqualified_search: false # Not commonly used for unqualified searches unqualified_search: false # Not commonly used for unqualified searches
# GitLab Container Registry # GitLab Container Registry
- registry: "registry.gitlab.com" - registry: "registry.gitlab.com"
@@ -117,7 +117,7 @@ podman_policy_trusted_registries:
# Registry configuration # Registry configuration
insecure: false insecure: false
blocked: false blocked: false
unqualified_search: false # Not commonly used for unqualified searches unqualified_search: false # Not commonly used for unqualified searches
# Example production configuration with signature verification: # Example production configuration with signature verification:
# podman_policy_default_type: "reject" # podman_policy_default_type: "reject"
@@ -178,6 +178,9 @@ podman_container_defaults:
quadlet_options: quadlet_options:
- "AutoUpdate=registry" - "AutoUpdate=registry"
- "Pull=newer" - "Pull=newer"
- |
[Install]
WantedBy=default.target
podman_containers: [] podman_containers: []
# Example container configurations: # Example container configurations:
@@ -657,9 +660,9 @@ podman_systemd_options:
### Prune Configuration ### Prune Configuration
podman_prune_enabled: true podman_prune_enabled: true
podman_prune_options: podman_prune_options:
container: true # Remove stopped containers container: true # Remove stopped containers
image: true # Remove unused images image: true # Remove unused images
network: true # Remove unused networks network: true # Remove unused networks
system: true # Prune all unused data system: true # Prune all unused data
system_all: true # Prune all unused data including build cache system_all: true # Prune all unused data including build cache
volume: true # Remove unused volumes volume: true # Remove unused volumes

View File

@@ -3,9 +3,7 @@
- name: Generate systemd service files for containers - name: Generate systemd service files for containers
vars: vars:
systemd_opts: "{{ systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
item.systemd if item.systemd is defined
else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
containers.podman.podman_generate_systemd: containers.podman.podman_generate_systemd:
name: "{{ item.name }}" name: "{{ item.name }}"
dest: "{{ podman_systemd_dir }}" dest: "{{ podman_systemd_dir }}"
@@ -32,9 +30,7 @@
- name: Generate systemd service files for pods - name: Generate systemd service files for pods
vars: vars:
systemd_opts: "{{ systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
item.systemd if item.systemd is defined
else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
containers.podman.podman_generate_systemd: containers.podman.podman_generate_systemd:
name: "{{ item.name }}" name: "{{ item.name }}"
dest: "{{ podman_systemd_dir }}" dest: "{{ podman_systemd_dir }}"