From 34b6a9c786b8a9cd8e457dfe993c582aafe06df0 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Mon, 16 Jul 2018 03:13:09 +0000
Subject: [PATCH] zun: set docker api version to 1.24

Kolla is using Docker API version 1.24 but the default is 1.26
in Zun. We need to configure it to 1.24 so that Zun and Kolla
can work together.

Partial-Bug: #1782055
Change-Id: I072dccc06fe35dccf25068ef0ca8f39cad9fdc60
---
 ansible/roles/zun/templates/zun.conf.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index c16fb5dc58..e89d7ea03a 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -110,3 +110,6 @@ policy_file = {{ zun_policy_file }}
 wsproxy_host = {{ api_interface_address }}
 wsproxy_port = {{ zun_wsproxy_port }}
 base_url = ws://{{ kolla_external_fqdn }}:{{ zun_wsproxy_port }}
+
+[docker]
+docker_remote_api_version = 1.24