add docker install for dock

Author: Anandkumar Patel

ansible/dock-init.yml

@@ -1,10 +1,5 @@
 ---
 - hosts: consul
-- hosts: mongodb
-- hosts: neo4j
-- hosts: rabbit
-- hosts: redis
-- hosts: redis-slave
 
 - hosts: "{{ dock }}"
   vars_files:

ansible/group_vars/alpha-dock-init.yml

@@ -3,7 +3,7 @@ app_name: "{{ name }}"
 app_repo: git@github.com:CodeNow/{{ name }}.git
 
 # for docker role
-docker_config: docks
+docker_config: dock
 
 # consul values
 consul_values:

ansible/roles/base_ubuntu/tasks/main.yml

@@ -1,6 +1,7 @@
 ---
 - name: ensure registry.runnable in /etc/hosts
   sudo: yes
+  when: dock is not defined
   lineinfile:
     dest=/etc/hosts
     line="{{ registry_host }} registry.runnable.com"

ansible/roles/docker/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-docker_package_name: lxc-docker-1.6.2
+docker_package_name: docker-engine=1.9.1-0~trusty

ansible/roles/docker/tasks/main.yml

@@ -36,13 +36,12 @@
 - name: add docker repository
   sudo: yes
   apt_repository:
-    repo: "deb https://get.docker.com/ubuntu docker main"
+    repo: "deb https://apt.dockerproject.org/repo ubuntu-{{ ansible_distribution_release }} main"
     state: present
     update_cache: yes
 
 - name: copy docker config file
   sudo: yes
-  when: docker_config == "runnable"
   template:
     src={{ docker_config }}
     dest=/etc/default/docker
@@ -51,7 +50,7 @@
 
 - name: install docker
   sudo: yes
-  when: restart is defined
+  when: restart is defined or dock is defined
   apt:
     pkg="{{ docker_package_name }}"
     state=present
@@ -60,5 +59,5 @@
     cache_valid_time=604800
 
 - name: restart docker
-  when: copied_config.changed and restart is defined
+  when: (copied_config.changed and restart is defined) or dock is defined
   command: sudo service docker restart

ansible/roles/node_service/tasks/main.yml

@@ -13,13 +13,6 @@
     state=latest
     production=yes
 
-- name: create new config file
-  sudo: yes
-  template:
-    src=upstart.conf
-    dest=/etc/init/{{ app_name }}.conf
-    backup=yes
-
 - name: make override file
   tags: deploy
   sudo: yes
@@ -28,6 +21,13 @@
     line="manual"
     create=yes
 
+- name: create new config file
+  sudo: yes
+  template:
+    src=upstart.conf
+    dest=/etc/init/{{ app_name }}.conf
+    backup=yes
+
 - name: restart service {{ app_name }}
   tags: deploy
   sudo: yes