From 401029e61756bc0a8474140b95620524e475a643 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Sat, 22 Feb 2020 21:20:48 +0000
Subject: [PATCH] Fix https://review.opendev.org/#/c/705361/

We need to configure CNI plugin first, then configure and restart
containerd. In before, the order is reverse so the CNI config
is not picked.

Change-Id: I1c0e753b19289c339e44f288cae02d7ee2957da6
---
 devstack/lib/docker | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/docker b/devstack/lib/docker
index c215f70..2558519 100644
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -123,11 +123,11 @@ function install_docker {
 
 function configure_docker {
     if [[ ${ENABLE_CONTAINERD_CRI} == "True" ]]; then
-        configure_containerd
-
         source $DEST/devstack-plugin-container/devstack/lib/cni/plugins
         configure_cni_plugins
 
+        configure_containerd
+
         source $DEST/devstack-plugin-container/devstack/lib/tools/crictl
         configure_crictl
     fi