Merge "Revert "Explicitly define infra_image in containers.conf""

This commit is contained in:
Zuul 2022-12-15 03:35:51 +00:00 committed by Gerrit Code Review
commit 6fc5418ce9
2 changed files with 0 additions and 4 deletions

View File

@ -80,7 +80,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

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 }}\""