summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-12-14 07:59:18 -0500
committerGitHub <noreply@github.com>2017-12-14 07:59:18 -0500
commite22ebadf60fe24f30924809cbe713a89f7f5c2d5 (patch)
treebb83a445a4c33fef6355128a244f5ecb104e335a
parent34f248849d0963403f7939d5b229381374d025a7 (diff)
parent8537a9a56e6c95023735c238b8d894aedc50899b (diff)
downloadopenshift-e22ebadf60fe24f30924809cbe713a89f7f5c2d5.tar.gz
openshift-e22ebadf60fe24f30924809cbe713a89f7f5c2d5.tar.bz2
openshift-e22ebadf60fe24f30924809cbe713a89f7f5c2d5.tar.xz
openshift-e22ebadf60fe24f30924809cbe713a89f7f5c2d5.zip
Merge pull request #6467 from giuseppe/use-fedoraproject-latest
containers: use registry.fedoraproject.org/latest instead of registry.fedoraproject.org/f2.X
-rw-r--r--roles/container_runtime/defaults/main.yml2
-rw-r--r--roles/etcd/defaults/main.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml
index d7eb8663f..dd185cb38 100644
--- a/roles/container_runtime/defaults/main.yml
+++ b/roles/container_runtime/defaults/main.yml
@@ -115,7 +115,7 @@ l_crio_image: "{{ openshift_crio_systemcontainer_image_override | default(l_crio
# systemcontainers_docker #
# ----------------------- #
l_crt_docker_image_prepend_dict:
- Fedora: "registry.fedoraproject.org/f25"
+ Fedora: "registry.fedoraproject.org/latest"
Centos: "docker.io/gscrivano"
RedHat: "registry.access.redhat.com/openshift3"
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index 3038ed9f6..86cea5c46 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -10,7 +10,7 @@ r_etcd_common_embedded_etcd: false
osm_etcd_image: 'registry.access.redhat.com/rhel7/etcd'
etcd_image_dict:
- origin: "registry.fedoraproject.org/f26/etcd"
+ origin: "registry.fedoraproject.org/latest/etcd"
openshift-enterprise: "{{ osm_etcd_image }}"
etcd_image: "{{ etcd_image_dict[openshift_deployment_type | default('origin')] }}"