Merge "Revert "Explicitly define infra_image in containers.conf""
This commit is contained in:
commit
6fc5418ce9
|
@ -80,7 +80,6 @@ tripleo_container_default_pids_limit: 4096
|
||||||
tripleo_container_events_logger_mechanism: journald
|
tripleo_container_events_logger_mechanism: journald
|
||||||
tripleo_container_default_runtime: runc
|
tripleo_container_default_runtime: runc
|
||||||
tripleo_container_default_network_backend: "cni"
|
tripleo_container_default_network_backend: "cni"
|
||||||
tripleo_container_default_infra_image: "registry.access.redhat.com/ubi8/pause"
|
|
||||||
|
|
||||||
# tell the tripleo_container_manage to inject
|
# tell the tripleo_container_manage to inject
|
||||||
# additional ordering dependencies for the systemd
|
# additional ordering dependencies for the systemd
|
||||||
|
|
|
@ -121,9 +121,6 @@
|
||||||
- section: engine
|
- section: engine
|
||||||
option: runtime
|
option: runtime
|
||||||
value: "\"{{ tripleo_container_default_runtime }}\""
|
value: "\"{{ tripleo_container_default_runtime }}\""
|
||||||
- section: engine
|
|
||||||
option: infra_image
|
|
||||||
value: "\"{{ tripleo_container_default_infra_image }}\""
|
|
||||||
- section: network
|
- section: network
|
||||||
option: network_backend
|
option: network_backend
|
||||||
value: "\"{{ tripleo_container_default_network_backend }}\""
|
value: "\"{{ tripleo_container_default_network_backend }}\""
|
||||||
|
|
Loading…
Reference in New Issue