From 5141306c7164d4c3b061b140c99f5a49300362ac Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 20 Apr 2020 09:47:12 -0700
Subject: [PATCH] Cleanup unneeded things post docker-compose upgrade
The zookeeper role can use the default pip installed docker-compose now.
We can also stop ensuring the distro package is removed as this has run
on all hosts at this point.
Change-Id: Ia034ae7d2c8e38494050698e1bfac0cc273dd200
---
playbooks/roles/install-docker/tasks/main.yaml | 6 ------
playbooks/roles/zookeeper/tasks/main.yaml | 6 ------
2 files changed, 12 deletions(-)
diff --git a/playbooks/roles/install-docker/tasks/main.yaml b/playbooks/roles/install-docker/tasks/main.yaml
index 0f980c90b7..91b08590a8 100644
--- a/playbooks/roles/install-docker/tasks/main.yaml
+++ b/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
diff --git a/playbooks/roles/zookeeper/tasks/main.yaml b/playbooks/roles/zookeeper/tasks/main.yaml
index 3d8e7a9e20..8752ffe66f 100644
--- a/playbooks/roles/zookeeper/tasks/main.yaml
+++ b/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