Merge pull request #761 from dang/docker-fixes

Docker fixes for MDS
pull/757/merge
Leseb 2016-05-07 01:03:35 +02:00
commit 54a4216933
1 changed files with 12 additions and 0 deletions

View File

@ -9,6 +9,8 @@
- docker - docker
- docker.io - docker.io
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == 'Ubuntu'
tags:
with_pkg
- name: install pip and docker on debian - name: install pip and docker on debian
apt: apt:
@ -19,6 +21,8 @@
- python-pip - python-pip
- docker-engine - docker-engine
when: ansible_distribution == 'Debian' when: ansible_distribution == 'Debian'
tags:
with_pkg
- name: install pip and docker on redhat - name: install pip and docker on redhat
yum: yum:
@ -30,6 +34,8 @@
when: when:
ansible_os_family == 'RedHat' and ansible_os_family == 'RedHat' and
ansible_pkg_mgr == "yum" ansible_pkg_mgr == "yum"
tags:
with_pkg
- name: install pip and docker on redhat - name: install pip and docker on redhat
dnf: dnf:
@ -41,6 +47,8 @@
when: when:
ansible_os_family == 'RedHat' and ansible_os_family == 'RedHat' and
ansible_pkg_mgr == "dnf" ansible_pkg_mgr == "dnf"
tags:
with_pkg
# NOTE (jimcurtis): need at least version 1.9.0 of six or we get: # NOTE (jimcurtis): need at least version 1.9.0 of six or we get:
# re:NameError: global name 'DEFAULT_DOCKER_API_VERSION' is not defined # re:NameError: global name 'DEFAULT_DOCKER_API_VERSION' is not defined
@ -48,9 +56,13 @@
pip: pip:
name: six name: six
version: 1.9.0 version: 1.9.0
tags:
with_pkg
# NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227 # NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
- name: install docker-py - name: install docker-py
pip: pip:
name: docker-py name: docker-py
version: 1.1.0 version: 1.1.0
tags:
with_pkg