Bläddra i källkod

Merge pull request #6467 from giuseppe/use-fedoraproject-latest

containers: use registry.fedoraproject.org/latest instead of registry.fedoraproject.org/f2.X
Russell Teague 7 år sedan
förälder
incheckning
e22ebadf60
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      roles/container_runtime/defaults/main.yml
  2. 1 1
      roles/etcd/defaults/main.yaml

+ 1 - 1
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"
 

+ 1 - 1
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')] }}"