diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-01-10 10:07:54 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-01-10 15:00:05 +0100 |
| commit | 1cb712cd789d08aa5c4fc109ffc31eef2ff0693f (patch) | |
| tree | d431b71e47c67bc560092163789e2099dbd2b6cd | |
| parent | 39e8ac6e5d9c0046c75635638c3206729b6c9c89 (diff) | |
| download | openshift-1cb712cd789d08aa5c4fc109ffc31eef2ff0693f.tar.gz openshift-1cb712cd789d08aa5c4fc109ffc31eef2ff0693f.tar.bz2 openshift-1cb712cd789d08aa5c4fc109ffc31eef2ff0693f.tar.xz openshift-1cb712cd789d08aa5c4fc109ffc31eef2ff0693f.zip | |
docker: use image from CentOS and Fedora registries
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index ae94fba2f..8203d15f5 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -115,20 +115,20 @@ l_crio_image: "{{ openshift_crio_systemcontainer_image_override | default(l_crio # ----------------------- # # systemcontainers_docker # # ----------------------- # -l_crt_docker_image_prepend_dict: - Fedora: "registry.fedoraproject.org/latest" - Centos: "docker.io/gscrivano" - RedHat: "registry.access.redhat.com/openshift3" +l_crt_docker_image_dict: + Fedora: "registry.fedoraproject.org/latest/docker" + Centos: "registry.centos.org/projectatomic/docker" + RedHat: "registry.access.redhat.com/openshift3/container-engine" openshift_docker_image_tag_default: "latest" l_crt_docker_image_tag_dict: openshift-enterprise: "{{ l_openshift_image_tag }}" origin: "{{ openshift_docker_image_tag | default(openshift_docker_image_tag_default) }}" -l_docker_image_prepend: "{{ l_crt_docker_image_prepend_dict[ansible_distribution] }}" +l_docker_image_prepend: "{{ l_crt_docker_image_dict[ansible_distribution] }}" l_docker_image_tag: "{{ l_crt_docker_image_tag_dict[openshift_deployment_type] }}" -l_docker_image_default: "{{ l_docker_image_prepend }}/{{ openshift_docker_service_name }}:{{ l_docker_image_tag }}" +l_docker_image_default: "{{ l_docker_image_prepend }}:{{ l_docker_image_tag }}" l_docker_image: "{{ openshift_docker_systemcontainer_image_override | default(l_docker_image_default) }}" l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" |