openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Revert "Explicitly define infra_image in containers.conf"" into stable/zed

This commit is contained in:
Zuul 2023-02-07 09:11:49 +00:00 committed by Gerrit Code Review
parent 701c67af62 e0f939b454
commit 8c60c2a896
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_ansible/roles/tripleo_podman/defaults/main.yml
View File

@ -81,7 +81,6 @@ tripleo_container_default_pids_limit: 4096
tripleo_container_events_logger_mechanism: journald
tripleo_container_default_runtime: runc
tripleo_container_default_network_backend: "cni"
tripleo_container_default_infra_image: "registry.access.redhat.com/ubi8/pause"
# tell the tripleo_container_manage to inject
# additional ordering dependencies for the systemd

3
tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_install.yml
View File

@ -121,9 +121,6 @@
- section: engine
option: runtime
value: "\"{{ tripleo_container_default_runtime }}\""
- section: engine
option: infra_image
value: "\"{{ tripleo_container_default_infra_image }}\""
- section: network
option: network_backend
value: "\"{{ tripleo_container_default_network_backend }}\""