Commit 1723c46

@@ -1,44 +1,54 @@
 ---
-- hosts: hosting
+- hosts: docker_host
   vars:
     docker_deps:
       - python-software-properties
       - python-apt
       - python-pycurl
       - wget
-    linux_kernel: 3.8.0-29-generic
-    vbox_additions_iso: http://dlc.sun.com.edgesuite.net/virtualbox/4.2.12/VBoxGuestAdditions_4.2.12.iso
+    linux_kernel: linux-image-generic-lts-raring
+    vbox_additions_iso: http://dlc.sun.com.edgesuite.net/virtualbox/4.3.4/VBoxGuestAdditions_4.3.4.iso 
+    docker_apt: "deb http://get.docker.io/ubuntu docker main"
   tasks:
     # install dependencies needed to run the docker lxc engine (http://www.docker.io/)
     # Basically a reworking of docker's Vagrentfile[1] into an ansible-playbook
     # [1] https://github.com/dotcloud/docker/blob/master/Vagrantfile
 
-    - name: Install linux-image-{{ linux_kernel }} # defined in group_vars/hosting.yml
-      apt: package=linux-image-{{ linux_kernel }} update_cache=yes
+    - name: Install {{ linux_kernel }} # defined in group_vars/hosting.yml
+      apt: package={{ linux_kernel }} update_cache=yes state=present
       sudo: yes
-      tags: repo
+      notify:
+      - restart server
 
     - name: Pre-repo add dependencies
       apt: pkg={{ item }} state=latest
-      with_items: docker_deps # defined in groupvars/hosting.yml
+      with_items: docker_deps
       sudo: yes
-      tags: repo 
-
-    - name: wget VBox Additions iso for fixing after kernel update
-      action: wget -q {{ vbox_additions_iso }}
-      tags: vbox
 
     - name: Add docker repository key
       apt_key: url=https://get.docker.io/gpg state=present
       sudo: yes
-      tags: repo
      
     - name: Add docker repository
-      apt_repository: repo='deb http://get.docker.io/ubuntu docker main' state=present
+      apt_repository: repo="{{ docker_apt }}" state=present
       sudo: yes
-      tags: repo
 
     - name: Install docker
       apt: pkg=lxc-docker state=latest update_cache=yes
       sudo: yes
-      tags: repo
+      notify:
+      - restart server
+
+    - name: add {{ ansible_user_id }} to docker group
+      user: name={{ ansible_user_id }} groups=docker append=yes
+      sudo: yes
+    
+    #- name: wget VBox Additions iso for fixing after kernel update
+    #  action: wget -q {{ vbox_additions_iso }}
+    #  tags: vbox
+
+  handlers:
+    - name: restart server
+      command: /sbin/reboot
+      sudo: yes
+

@@ -1,5 +0,0 @@
-[local-hosting]
-127.0.0.1
-
-[hosting:children]
-local-hosting

@@ -1,14 +1,13 @@
 #ansible-docker
-
 ansible playbook for setting up docker
 
 ##docker.yml
-setup a lxc host with the required dependencies
+setup a lxc-docker host with the required dependencies
 
-example run: ```ansible-playbook -i inventory docker.yml --tags repo```
+example run: ```ansible-playbook docker.yml```
 
-**tags**
+make sure to add a docker_host item to your inventory (hosts) file
 
-* **repo** - install docker from the docker deb repository
-* **bin** - install docker from the docker-latest binary [not yet implemented]
-* **vbox** - for use with vbox host, re-install VBox Guest Additions [not yet implemented]
+###things not implemented
+* install docker from the docker-latest binary instead of repos
+* re-install VBox Guest Additions if on virtualbox and kernel updated