diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-11 23:28:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 23:28:33 -0400 |
| commit | 555503784981589562a281e0d96ed89114a02e61 (patch) | |
| tree | 0757d1fbb6cb099b70798425bd3dfa2e218ffcb2 /inventory/byo | |
| parent | 33d254a4907e15d4abd9d51aad4bed03a100e9e3 (diff) | |
| parent | ab973c72397d8890465cf9c315b79d2ec73d4a62 (diff) | |
| download | openshift-555503784981589562a281e0d96ed89114a02e61.tar.gz openshift-555503784981589562a281e0d96ed89114a02e61.tar.bz2 openshift-555503784981589562a281e0d96ed89114a02e61.tar.xz openshift-555503784981589562a281e0d96ed89114a02e61.zip | |
Merge pull request #5356 from ashcrow/openshift-docker-systemcontainer-image-override
Merged by openshift-bot
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 c32c47fe1..dbe57bbd2 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -118,7 +118,7 @@ openshift_release=v3.6 # Force the registry to use for the docker/crio system container. By default the registry # 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_registry_override="registry.example.com" +#openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest" #openshift_crio_systemcontainer_image_registry_override="registry.example.com" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index e867ffbae..0d60de6d2 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -118,7 +118,7 @@ openshift_release=v3.6 # Force the registry to use for the container-engine/crio system container. By default the registry # 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_registry_override="registry.example.com" +#openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest" #openshift_crio_systemcontainer_image_registry_override="registry.example.com" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" |