diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-22 07:33:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 07:33:38 -0700 |
| commit | 5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d (patch) | |
| tree | af2db6c1e630649b5f1e484692a01e31c4093770 /inventory/byo | |
| parent | 91c1c6fc7323ca885956102248b2e5b18e5332c3 (diff) | |
| parent | e6001c7b092f818585bdf7bd188ea4a10ee1f40d (diff) | |
| download | openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.gz openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.bz2 openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.xz openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.zip | |
Merge pull request #5354 from ashcrow/crio-systemcontainer-image-override
Automatic merge from submit-queue
cri-o: Allow full image override
``openshift_crio_systemcontainer_image_registry_override`` has been replaced
with ``openshift_crio_systemcontainer_image_override``. The difference is
``openshift_crio_systemcontainer_image_override`` takes a full image path
including the tag.
Example:
```
openshift_crio_systemcontainer_image_override=gscrivano/cri-o-centos:latest
```
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 486fe56a0..cdcfbc588 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -119,7 +119,7 @@ openshift_release=v3.7 # will be built off of the deployment type and ansible_distribution. Only # use this option if you are sure you know what you are doing! #openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest" -#openshift_crio_systemcontainer_image_registry_override="registry.example.com" +#openshift_crio_systemcontainer_image_override="registry.example.com/cri-o:latest" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 92a0927e5..9dd76a355 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -119,7 +119,7 @@ openshift_release=v3.7 # will be built off of the deployment type and ansible_distribution. Only # use this option if you are sure you know what you are doing! #openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest" -#openshift_crio_systemcontainer_image_registry_override="registry.example.com" +#openshift_crio_systemcontainer_image_override="registry.example.com/cri-o:latest" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" |