openstack/magnum
Code Issues Proposed changes

Merge "Containerd cni plugin path in CoreOS 35"

Browse Source
This commit is contained in:
Zuul 2023-02-13 08:28:49 +00:00 committed by Gerrit Code Review
commit 54f1a4b6c7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
View File

@ -10,6 +10,9 @@ ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then
$ssh_cmd systemctl disable docker.service docker.socket
$ssh_cmd systemctl stop docker.service docker.socket
if $ssh_cmd [ -f /etc/containerd/config.toml ] ; then
$ssh_cmd sed -i 's/bin_dir.*$/bin_dir\ =\ \""\/opt\/cni\/bin\/"\"/' /etc/containerd/config.toml
fi
if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then
CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/cri-containerd-cni-${CONTAINERD_VERSION}-linux-amd64.tar.gz"
fi