From 553acf139fa17347310d9c8a1281298c8cd2ead1 Mon Sep 17 00:00:00 2001
From: Bryan Strassner <bryan.strassner@gmail.com>
Date: Tue, 31 Jul 2018 15:57:15 -0500
Subject: [PATCH] Remove pip of docker during image publishing

During the publish of an image post-merge, an error was being rasied due
to a conflict between the ansible-supplied docker-py and the pip
installed docker. This removes the pip installed docker to allow
publishing to proceed.

Change-Id: I6a1ff54ed2d2af85cbe44ed50b1c637dee9adf54
---
 tools/gate/roles/build-images/tasks/airship-shipyard.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
index c5a30863..637cbd51 100644
--- a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
+++ b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
@@ -68,9 +68,6 @@
       with_items:
         - docker-ce
         - python-pip
-    - pip:
-        name: docker
-        version: 2.7.0
     # NOTE(SamYaple): Allow all connections from containers to host so the
     # containers can access the http server for git and wheels
     - iptables: