diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-03-17 14:14:26 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-03-19 13:52:19 -0700 |
| commit | cfc90dff4b08b7c82641c697045d265ba73b1235 (patch) | |
| tree | 6474a26321ad07caefca9213991a54c9da1fd429 | |
| parent | e02fbcdb0f5d6ecb014aa450de2ef0a005e1cb66 (diff) | |
| download | ansible-cfc90dff4b08b7c82641c697045d265ba73b1235.tar.gz | |
And ran into a different problem with centos6. Sigh.
| -rw-r--r-- | test/integration/roles/test_docker/tasks/main.yml | 5 |
1 files 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 |