Merge branch 'master' into glance-perf

resources/glance_api_service/actions/remove.yml

@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
+    - name: glance api container
-    - shell: docker rm {{ name }}
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent

resources/glance_registry_service/actions/remove.yml

@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
+    - name: glance registry container
-    - shell: docker rm {{ name }}
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent

resources/haproxy_service/actions/remove.yml

@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
+    - name: haproxy container
-    - shell: docker rm {{ name }}
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent

resources/keystone_service/actions/remove.yml

@@ -2,5 +2,8 @@
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
+    - name: keystone container
-    - shell: docker rm {{ name }}
+      docker:
+        image: {{ image }}
+        name: {{ name }}
+        state: absent

resources/rabbitmq_service/actions/remove.yml

@@ -1,4 +1,3 @@
-# TODO
 - hosts: [{{ ip }}]
   sudo: yes
   tasks: