From f50e9b0287e1e5721569a5f0ccafc5ab31e1d37a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 1 Oct 2021 12:47:45 +0200
Subject: [PATCH] Revert to installing Docker SDK with upper constraints

docker 5.0.2 is now allowed in requirements upper constraints [1].

[1] https://review.opendev.org/c/openstack/requirements/+/811522

Change-Id: I114fbb8893817b271e330de92281c9a22d70b5da
---
 ansible/kolla-target-venv.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ansible/kolla-target-venv.yml b/ansible/kolla-target-venv.yml
index 89d7dc15..7fd9e3dc 100644
--- a/ansible/kolla-target-venv.yml
+++ b/ansible/kolla-target-venv.yml
@@ -49,10 +49,7 @@
             name: docker
             state: latest
             virtualenv: "{{ kolla_ansible_target_venv }}"
-            # FIXME(mgoddard): docker 5.0.1 is currently in master
-            # upper-constraints, but fails with an unexpected keyword argument,
-            # 'disable_buffering'. Install it without UC for now.
-            # extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
+            extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
           become: True
 
         - name: Ensure kolla-ansible virtualenv has SELinux bindings installed
-- 
GitLab