Merge "Cleanup unneeded things post docker-compose upgrade"

playbooks/roles/install-docker/tasks/main.yaml

@@ -17,12 +17,6 @@
 
 # We install docker-compose from pypi to get features like
 # stop_grace_period.
-- name: Remove distro docker-compose
-  package:
-    name:
-      - docker-compose
-    state: absent
-
 - name: ensure pip3 is installed
   include_role:
     name: pip3

playbooks/roles/zookeeper/tasks/main.yaml

@@ -36,12 +36,6 @@
   template:
     src: myid.j2
     dest: /var/zookeeper/data/myid
-# Temporary until 719589 merges.
-- name: Install docker-compose
-  pip:
-    name: docker-compose
-    state: present
-    executable: pip3
 - name: Run docker-compose pull
   shell:
     cmd: docker-compose pull