openstack/devstack-plugin-container
Code Issues Proposed changes

Fix https://review.opendev.org/#/c/705361/

Browse Source 
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
This commit is contained in:
Hongbin Lu 2020-02-22 21:20:48 +00:00
parent d80ff940e1
commit 401029e617
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/docker
View File

@ -123,11 +123,11 @@ function install_docker {
function configure_docker { function configure_docker {
if [[ ${ENABLE_CONTAINERD_CRI} == "True" ]]; then if [[ ${ENABLE_CONTAINERD_CRI} == "True" ]]; then
configure_containerd
source $DEST/devstack-plugin-container/devstack/lib/cni/plugins source $DEST/devstack-plugin-container/devstack/lib/cni/plugins
configure_cni_plugins configure_cni_plugins
configure_containerd
source $DEST/devstack-plugin-container/devstack/lib/tools/crictl source $DEST/devstack-plugin-container/devstack/lib/tools/crictl
configure_crictl configure_crictl
fi fi