From 9e14471471ba20c11e5c81dd9dd8dc24fa83f169 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 17 Mar 2015 14:14:26 -0700 Subject: [PATCH] And ran into a different problem with centos6. Sigh. --- test/integration/roles/test_docker/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/roles/test_docker/tasks/main.yml b/test/integration/roles/test_docker/tasks/main.yml index d0abc5a9c6..bdf252c42f 100644 --- a/test/integration/roles/test_docker/tasks/main.yml +++ b/test/integration/roles/test_docker/tasks/main.yml @@ -1,9 +1,10 @@ - include: docker-setup-rht.yml when: ansible_distribution in ['Fedora'] -- include: docker-setup-rht.yml +#- include: docker-setup-rht.yml # Packages on RHEL and CentOS 7 are broken, broken, broken. Revisit when # they've got that sorted out - when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_lsb.major_release|int == 6 + # CentOS 6 currently broken by conflicting files in pyhton-backports and python-backports-ssl_match_hostname + #when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_lsb.major_release|int == 6 # python-docker isn't available until 14.10. Revist at the next Ubuntu LTS #- include: docker-setup-debian.yml