Merge pull request #7 from ninthnails/master

yum repo URL defaults and apt module

README.md

@@ -1,8 +1,40 @@
-ansible-docker
+ansible-docker - Ansible Playbook for Docker
 ==============
 
-Docker Playbook for Ansible
+## Overview
 
-This playbook will install Docker.
+The `ansible-docker` role supports the installation and configuration of Docker Engine. It supports Ubuntu and RedHat/Centos.
+
+## Requirements
+
+No requirement.
+
+
+## Development
+
+Changes can be tested by using Vagrant machines configure for this role, see `Vagrantfile`.
+
+```bash
+cd ansible-docker/
+vagrant up {travis|ubuntu|centos7}
+vagrant ssh {travis|ubuntu|centos7}
+
+$ cd roles/ansible-docker/
+$ ansible-playbook -i ci/inventory ci/playbook.yml --connection=local --sudo
+
+PLAY [localhost] ************************************************************** 
+
+GATHERING FACTS *************************************************************** 
+ok: [localhost]
+
+...
+
+TASK: [command docker run hello-world] **************************************** 
+changed: [localhost]
+
+PLAY RECAP ******************************************************************** 
+localhost                  : ok=12   changed=1    unreachable=0    failed=0   
+```
 
 Support open source!
+

defaults/main.yml

@@ -1,5 +1,7 @@
 ---
-docker_playbook_version: "0.1.2"
+# RedHat: Docker yum repository URL
+docker_yum_repo: "https://yum.dockerproject.org/repo/main/{{ ansible_distribution | lower }}/{{ os_version_major }}"
+docker_yum_repo_gpg: 'https://yum.dockerproject.org/gpg'
 
 docker_opts: ''
 docker_create_group: true
@@ -12,7 +14,7 @@ docker_service_start_timeout: ''    # use system default value
 #   - uncomment `docker_opts` or provide it as a override
 #
 # Note:
-#   By setting `-H` opt for docker, it will no longer be listenting
+#   By setting `-H` opt for docker, it will no longer be listening
 #   on the socket. You cannot have both. You must choose socket `-d`
 #   or tcp `-H`.
 #

tasks/Debian.yml

@@ -1,26 +1,17 @@
-- name: Get uname
-  command: uname -r
-  register: os_uname
-
-# would rather have used ansible apt-key...
+---
 - name: Add specific key
-  command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys {{docker_repo_key}}
-
-- name: Update
-  command: apt-get update
+  apt_key: id={{docker_repo_key}} keyserver=keyserver.ubuntu.com state=present
 
 - name: Install https apt transport package
-  command: apt-get install -y apt-transport-https
+  apt: pkg=apt-transport-https state=present update_cache=yes
 
 - name: Add docker repo
-  command: sudo sh -c "echo deb {{docker_repo}} docker main > /etc/apt/sources.list.d/docker.list"
+  apt_repository: repo='deb {{ docker_repo }} docker main' state=present
 
 - name: Install lxc-docker package
-  apt: pkg={{item}} state=present update_cache=yes
-  with_items:
-    - lxc-docker
+  apt: pkg=lxc-docker state=present update_cache=yes
 
-# consider seperate role here
+# consider separate role here
 - name: Change ufw forward policy to ACCEPT
   command: sed -i 's/DEFAULT_FORWARD_POLICY="DROP"/DEFAULT_FORWARD_POLICY="ACCEPT"/g' /etc/default/ufw
   when: docker_listen_tcp == True
@@ -29,6 +20,6 @@
   command: ufw reload
   when: docker_listen_tcp == True
 
-- name: Allow incomming tcp traffic on {{docker_listen_port}}
+- name: Allow incoming tcp traffic on {{docker_listen_port}}
   command: ufw allow {{docker_listen_port}}/tcp
   when: docker_listen_tcp == True

templates/docker-repo.j2

@@ -3,4 +3,4 @@ name=Docker Repository
 baseurl={{ docker_yum_repo }}
 enabled=1
 gpgcheck=1
-gpgkey=https://yum.dockerproject.org/gpg
+gpgkey={{ docker_yum_repo_gpg }}

vars/RedHat.yml

@@ -1,4 +1,3 @@
 os_version: "{{ ansible_lsb.release if ansible_lsb is defined else ansible_distribution_version }}"
 os_version_major: "{{ os_version | regex_replace('^([0-9]+)[^0-9]*.*', '\\\\1') }}"
 
-docker_yum_repo: "https://yum.dockerproject.org/repo/main/{{ ansible_distribution | lower }}/{{ os_version_major }}"

vars/main.yml

@@ -0,0 +1 @@
+docker_playbook_version: "0.1.3"