2 files changed, 25 insertions, 8 deletions
diff --git a/ansible/playbook-test.yml b/ansible/playbook-test.yml
index f110435..bf8a735 100644
--- a/ansible/playbook-test.yml
+++ b/ansible/playbook-test.yml
@@ -7,17 +7,26 @@
   vars:
   - images:
     - name: "gondul-db-test"
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
       links: []
       ports: []
+    - name: "gondul-graphite-test"
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" , "{{ pwd.stdout }}/data/graphite:/var/lib/graphite" ]
+      links: []
+      ports: []
+    - name: "gondul-collector-test"
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
+      links: [ "gondul-db-test:db" ]
+      ports: []
     - name: "gondul-front-test"
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
       links: [ "gondul-db-test:db" ]
       ports: "{{ front_ports }}"
     - name: "gondul-varnish-test"
-      links: [ "gondul-front-test:gondul-front" ]
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
+      links: [ "gondul-front-test:gondul-front", "gondul-graphite-test:gondul-graphite" ]
       ports: "{{ varnish_ports }}"
-    - name: "gondul-collector-test"
-      links: [ "gondul-db-test:db" ]
-      ports: []
     - name: "gondul-snmp-test"
+      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
       links: [ "gondul-db-test:db" ]
       ports: []
diff --git a/ansible/roles/basics/tasks/main.yml b/ansible/roles/basics/tasks/main.yml
index 0497833..6a92a19 100644
--- a/ansible/roles/basics/tasks/main.yml
+++ b/ansible/roles/basics/tasks/main.yml
@@ -2,14 +2,18 @@
   register: pwd
   tags:
   - build
+  - stop
   - start
   - test
 - name: make all
   docker_image:
       state: present
+      docker_api_version: 1.18
       name: "{{ item.name }}"
       dockerfile: build/test/{{ item.name }}.Dockerfile
       path: "{{ pwd.stdout }}"
+      force: true
+      rm: false
   with_items: "{{ images }}"
   tags: 
   - build
@@ -17,6 +21,7 @@
 - name: stop all
   docker:
       name: "{{ item.name }}"
+      docker_api_version: 1.18
       state: stopped
       image: "{{ item.name }}"
       stop_timeout: 2
@@ -25,14 +30,17 @@
   - stop
 
 - name: start all
-  docker: 
+  docker_container: 
       name: "{{ item.name }}"
       image: "{{ item.name }}"
+      docker_api_version: 1.18
       state: started
-      net: bridge
-      ports: "{{ item.ports }}"
+      network_mode: bridge
+      recreate: true
+      restart: true
+      published_ports: "{{ item.ports }}"
       links: "{{ item.links  }}"
-      volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
+      volumes: "{{ item.volumes }}"
   with_items: "{{ images }}"
   tags: 
   - start