Use a template to generate docker.list

.gitignore

@@ -0,0 +1,2 @@
+.vagrant/
+

Vagrantfile

@@ -0,0 +1,51 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.ssh.forward_agent = true
+  config.vm.synced_folder Dir.getwd, "/home/vagrant/roles/ansible-docker", nfs: true
+
+  # ubuntu 12.04 that Travis CI is using
+  config.vm.define 'travis', primary: true do |c|
+    c.vm.network "private_network", ip: "192.168.100.2"
+    c.vm.box = "precise-server-cloudimg-amd64-vagrant-disk1"
+    c.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+    c.vm.provision "shell" do |s|
+      s.inline = "apt-get update -y; apt-get install python-software-properties; add-apt-repository ppa:rquillo/ansible; apt-get update -y; apt-get install ansible -y; cd /home/vagrant/roles/ansible-docker/tests; ansible-playbook -i inventory playbook.yml"
+      s.privileged = true
+    end
+  end
+
+  # ubuntu 14.04
+  config.vm.define 'ubuntu', primary: true do |c|
+    c.vm.network "private_network", ip: "192.168.100.3"
+    c.vm.box = "trusty-server-cloudimg-amd64-vagrant-disk1"
+    c.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+    c.vm.provision "shell" do |s|
+      s.inline = "apt-get update -y; apt-get install -y software-properties-common; apt-add-repository ppa:ansible/ansible; apt-get update -y; apt-get install -y ansible; cd /home/vagrant/roles/ansible-docker/tests; ansible-playbook -i inventory playbook.yml"
+      s.privileged = true
+    end
+  end
+
+  # centos 6:
+  config.vm.define 'centos' do |c|
+    c.vm.network "private_network", ip: "192.168.100.4"
+    c.vm.box = "centos65-x86_64-20140116"
+    c.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
+    c.vm.provision "shell" do |s|
+      s.inline = "yum update gmp; yum install ansible -y; cd /home/vagrant/roles/ansible-docker/tests; ansible-playbook -i inventory playbook.yml"
+      s.privileged = true
+    end
+  end
+
+  # centos 7:
+  config.vm.define 'centos7' do |c|
+    c.vm.network "private_network", ip: "192.168.100.5"
+    c.vm.box = "centos/7"
+    c.vm.provision "shell" do |s|
+      s.inline = "yum install -y epel-release; yum install -y ansible; cd /home/vagrant/roles/ansible-docker/tests; ansible-playbook -i inventory playbook.yml"
+      s.privileged = true
+    end
+  end
+
+end

ci/tests.yml

@@ -4,8 +4,12 @@
   connection: local
   sudo: yes
   gather_facts: false
-  
+
   tasks:
-    - command: docker run hello-world
+    - name: Wait for Docker to be up
+      wait_for: path=/var/run/docker.sock state=started delay=3 timeout=5
+
+    - name: Test that Docker can run hello-world
+      command: docker run --rm hello-world
       register: status
       failed_when: status.rc != 0

tasks/Debian.yml

@@ -2,25 +2,30 @@
   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}}
+  apt_key:
+    id: "{{docker_repo_key}}"
+    keyserver: keyserver.ubuntu.com
+    state: present
 
-- name: Update
-  command: apt-get update
+- name: Add docker repo
+  apt_repository:
+    repo: "deb {{ docker_repo }} docker main"
+    state: present
 
 - name: Install https apt transport package
-  command: apt-get install -y apt-transport-https
-
-- name: Add docker repo
-  command: sudo sh -c "echo deb {{docker_repo}} docker main > /etc/apt/sources.list.d/docker.list"
+  apt: pkg=apt-transport-https state=present update_cache=yes cache_valid_time=600
 
 - name: Install lxc-docker package
-  apt: pkg={{item}} state=present update_cache=yes
+  apt:
+    pkg: "{{item}}"
+    state: present
+    update_cache: yes
+    cache_valid_time: 600
   with_items:
     - lxc-docker
 
-# 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

tasks/RedHat.yml

@@ -1,7 +1,7 @@
 
 - name: Install Docker Repository
   template: src=docker-repo.j2 dest=/etc/yum.repos.d/docker.repo
- 
+
 - name: Install Docker Engine
   yum: name=docker-engine state=present
 

tasks/init.yml

@@ -24,7 +24,7 @@
   when: systemd_check.stat.exists == true
   notify: 
     - Restart Docker
-  
+
 - name: Docker systemd file
   template: src=docker-service.j2 dest=/lib/systemd/system/docker.service backup=yes
   when: systemd_check.stat.exists == true

tasks/main.yml

@@ -7,10 +7,10 @@
   when: docker_create_group
   tags:
     - config
-  
+
 - include: Debian.yml
   when: ansible_os_family == "Debian"
-  
+
 - include: RedHat.yml
   when: ansible_os_family == "RedHat"
 

templates/docker-defaults.j2

@@ -1,3 +1,4 @@
 # Generated by Ansible for {{ansible_fqdn}}
 
-DOCKER_OPTS={{docker_opts}}
+DOCKER_OPTS="{{docker_opts}}"
+

templates/docker-init.j2

@@ -1,8 +1,7 @@
 # Generated by Ansible for {{ansible_fqdn}}
 description "Docker daemon"
 
-start on filesystem and started lxc-net
-stop on runlevel [!2345]
+start on stopped rc RUNLEVEL=[2345]
 
 respawn
 

tests/inventory

@@ -0,0 +1,2 @@
+[local]
+localhost

tests/main.yml

@@ -0,0 +1,14 @@
+---
+
+- hosts: localhost
+  connection: local
+  sudo: yes
+
+  tasks:
+    - name: Wait for Docker to be up
+      wait_for: path=/var/run/docker.sock state=started delay=3 timeout=5
+
+    - name: Test that Docker can run hello-world
+      command: docker run --rm hello-world
+      register: status
+      failed_when: status.rc != 0

tests/playbook.yml

@@ -0,0 +1,14 @@
+---
+#
+# Test Playbook
+#
+
+- hosts: localhost
+  connection: local
+  sudo: yes
+
+  roles:
+    - {role: ../../}
+
+- include: main.yml
+