diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 10 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yml | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 5361bb08c..87e5bbc88 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.76-1 ./ +3.0.77-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 034c869f1..3c627ab65 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.76 +Version: 3.0.77 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -279,6 +279,14 @@ Atomic OpenShift Utilities includes %changelog +* Mon Apr 11 2016 Troy Dawson <tdawson@redhat.com> 3.0.77-1 +- Fix a docker-storage sysconfig bug. (dgoodwin@redhat.com) +- update bootstrap-fedora to include python2-firewall for F24+ + (maxamillion@fedoraproject.org) +- Merge openshift_env hostvars. (abutcher@redhat.com) +- Add openshift_hosted_facts role and remove hosted facts from + openshift_common. (abutcher@redhat.com) + * Fri Apr 08 2016 Troy Dawson <tdawson@redhat.com> 3.0.76-1 - a-o-i: Support openshift_image_tag (smunilla@redhat.com) - Bug 1324729 - Import xPaas image streams failed during 3.2 installation diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 2d207a1a9..1d8493938 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -16,14 +16,13 @@ action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version if docker_version != '' else '' }} state=present" when: not openshift.common.is_atomic | bool and not docker_downgrade_result | changed -- stat: path=/etc/sysconfig/docker - register: docker_check - when: docker_downgrade_result | changed +- stat: path=/etc/sysconfig/docker-storage + register: docker_storage_check - name: Remove deferred deletion for downgrades from 1.9 command: > sed -i 's/--storage-opt dm.use_deferred_deletion=true//' /etc/sysconfig/docker-storage - when: docker_downgrade_result | changed and docker_check.stat.exists | bool and docker_version_result.stdout | default('0.0', True) | version_compare('1.9', '>=') and docker_version | version_compare('1.9', '<') + when: docker_downgrade_result | changed and docker_storage_check.stat.exists | bool and docker_version_result.stdout | default('0.0', True) | version_compare('1.9', '>=') and docker_version | version_compare('1.9', '<') - name: enable and start the docker service service: |