summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-05-09 15:07:29 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-05-09 15:07:29 -0400
commit2356e549bae059a1d3e9336102115f13163ffd31 (patch)
tree1d7979c3057156c8687f9754adbf095654a4c88d
parent9096284f5f9ae754e33c736f9ae7185081618a59 (diff)
parent72737e5c3bd345250d6745e8411ab8b19925b766 (diff)
downloadopenshift-2356e549bae059a1d3e9336102115f13163ffd31.tar.gz
openshift-2356e549bae059a1d3e9336102115f13163ffd31.tar.bz2
openshift-2356e549bae059a1d3e9336102115f13163ffd31.tar.xz
openshift-2356e549bae059a1d3e9336102115f13163ffd31.zip
Merge tag 'openshift-ansible-3.0.89-1'
Tagging package [openshift-ansible] version [3.0.89-1] in directory [./].
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec5
-rw-r--r--roles/docker/tasks/main.yml2
3 files changed, 6 insertions, 3 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 3f8085fa9..4fc92f3c7 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.0.88-1 ./
+3.0.89-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 473e74bee..6a5695177 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -5,7 +5,7 @@
}
Name: openshift-ansible
-Version: 3.0.88
+Version: 3.0.89
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -183,6 +183,9 @@ Atomic OpenShift Utilities includes
%changelog
+* Mon May 09 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.89-1
+- Use yum swap to downgrade docker (sdodson@redhat.com)
+
* Fri May 06 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.88-1
- Open port 53 whenever we're unsure of version (sdodson@redhat.com)
- Fix unsafe boolean handling on use_dnsmasq (sdodson@redhat.com)
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 3fd2ef50c..b9b2666fb 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -16,7 +16,7 @@
when: docker_storage_check.stat.exists | bool and not docker_version_result | skipped and docker_version_result.stdout | default('0.0', True) | version_compare('1.9', '>=') and docker_version | version_compare('1.9', '<')
- name: Downgrade docker if necessary
- command: "{{ ansible_pkg_mgr }} downgrade -y docker-{{ docker_version }}"
+ command: "{{ ansible_pkg_mgr }} swap -y docker-* docker-*{{ docker_version }}"
register: docker_downgrade_result
when: not docker_version_result | skipped and docker_version_result.stdout | default('0.0', True) | version_compare(docker_version, 'gt')