From 9ad4fe0d41cb3d75b917809cde9e888727c437c1 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam+git@yaple.net>
Date: Wed, 7 Feb 2018 19:57:03 -0500
Subject: [PATCH] Pin pip docker version

Change-Id: Iee65af745b8c16e6f93acf121a0e3ba3613db288
---
 playbooks/post.yaml       | 13 +++++++------
 playbooks/setup-gate.yaml |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/playbooks/post.yaml b/playbooks/post.yaml
index 92dcac1..e002d58 100644
--- a/playbooks/post.yaml
+++ b/playbooks/post.yaml
@@ -4,12 +4,13 @@
       block:
         # NOTE(SamYaple): https://github.com/ansible/ansible/issues/14131
         - command: cp -r /home/zuul/.ansible_async /logs/async_logs
-        - command: journalctl -xb -u docker.service
-          register: docker_daemon_log
-          no_log: True
-        - copy:
-            content: "{{ docker_daemon_log.stdout }}"
-            dest: /logs/docker_daemon.log
+        # FIXME(SamYaple): running this is causing the gate to hang
+        #- command: journalctl -xb -u docker.service
+        #  register: docker_daemon_log
+        #  no_log: True
+        #- copy:
+        #    content: "{{ docker_daemon_log.stdout }}"
+        #    dest: /logs/docker_daemon.log
       become: true
 
     - name: Copy logs
diff --git a/playbooks/setup-gate.yaml b/playbooks/setup-gate.yaml
index 6fbe161..dec6b7a 100644
--- a/playbooks/setup-gate.yaml
+++ b/playbooks/setup-gate.yaml
@@ -45,6 +45,7 @@
             - python-pip
         - pip:
             name: docker
+            version: 2.7.0
         - docker_container:
             name: registry
             image: registry:2