Browse Source

Merge tag 'openshift-ansible-3.0.89-1'

Tagging package [openshift-ansible] version [3.0.89-1] in directory [./].
Brenton Leanhardt 9 years ago
parent
commit
2356e549ba
3 changed files with 6 additions and 3 deletions
  1. 1 1
      .tito/packages/openshift-ansible
  2. 4 1
      openshift-ansible.spec
  3. 1 1
      roles/docker/tasks/main.yml

+ 1 - 1
.tito/packages/openshift-ansible

@@ -1 +1 @@
-3.0.88-1 ./
+3.0.89-1 ./

+ 4 - 1
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)

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