cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Attempt to enable docker tests for rhel/centos6 as well

Browse source
This commit is contained in:
Toshio Kuratomi 2015-03-17 13:52:44 -07:00
parent f8ec1451ea
commit 85e137bbad
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/integration/roles/test_docker/tasks/docker-setup-rht.yml
View file

@ -1,4 +1,18 @@
- name: Install docker packages (yum)
yum:
state: present
name: docker,docker-registry,python-docker-py,nmap-ncat
name: docker-io,docker-registry,python-docker-py
- name: Install netcat
yum:
state: present
name: nmap-ncat
# RHEL7 as well...
when: ansible_distribution == 'Fedora'
- name: Install netcat
yum:
state: present
name: nc
when: ansible_distribution != 'Fedora'

7
test/integration/roles/test_docker/tasks/main.yml
View file

@ -1,8 +1,9 @@
- include: docker-setup-rht.yml
when: ansible_distribution in ['Fedora']
# Packages on RHEL and CentOS are broken, broken, broken. Revisit when
- 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 ['Fedora', 'RedHat', 'CentOS']
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
@ -12,3 +13,5 @@
# Add other distributions as the proper packages become available
when: ansible_distribution in ['Fedora']
- include: docker-tests.yml
when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_lsb.major_release|int == 6