diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 21 | ||||
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 2 | 
4 files changed, 23 insertions, 4 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 15dc27984..4924f050b 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.9.0-0.8.0 ./ +3.9.0-0.9.0 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 87423f59e..943931572 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -10,7 +10,7 @@  Name:           openshift-ansible  Version:        3.9.0 -Release:        0.8.0%{?dist} +Release:        0.9.0%{?dist}  Summary:        Openshift and Atomic Enterprise Ansible  License:        ASL 2.0  URL:            https://github.com/openshift/openshift-ansible @@ -285,6 +285,25 @@ Atomic OpenShift Utilities includes  %changelog +* Thu Dec 14 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.9.0-0.9.0 +- etcd: use Fedora /latest/ instead of hardcoding the version +  (gscrivan@redhat.com) +- docker: use Fedora /latest/ instead of hardcoding the version +  (gscrivan@redhat.com) +- upgrade node mark 2 (mgugino@redhat.com) +- Refactor node upgrade to include less serial tasks (mgugino@redhat.com) +- fix 1519808. Only annotate ops projects when openshift_logging_use_ops=true +  (jcantril@redhat.com) +- Ensure that clients are version bound (sdodson@redhat.com) +- Support for making glusterfs storage class a default one. +  (jmencak@redhat.com) +- Add support for storage classes to openshift_prometheus role. +  (jmencak@redhat.com) +- Do not escalate privileges in logging stack deployment task +  (iacopo.rozzo@amadeus.com) +- Multimaster openshift+contiv fixes (landillo@cisco.com) +- Sync latest image-streams and templates (alexandre.lossent@cern.ch) +  * Tue Dec 12 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.9.0-0.8.0  - Remove empty openshift_hosted_facts role (mgugino@redhat.com)  - Refactor upgrade codepaths step 1 (mgugino@redhat.com) 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')] }}"  | 
