kata-deploy: use clh instead of cloud-hypervisor

Let's use clh consistently.

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
This commit is contained in:
Eric Ernst 2020-01-07 17:29:30 -08:00
parent 59a34bb1d5
commit b023d8d634

View File

@ -17,7 +17,7 @@ shims=(
"fc" "fc"
"qemu" "qemu"
"qemu-virtiofs" "qemu-virtiofs"
"cloud-hypervisor" "clh"
) )
# If we fail for any reason a message will be displayed # If we fail for any reason a message will be displayed
@ -148,14 +148,9 @@ function configure_containerd_runtime() {
local runtime="kata" local runtime="kata"
local configuration="configuration" local configuration="configuration"
if [ -n "${1-}" ]; then if [ -n "${1-}" ]; then
if [ "$1" == "cloud-hypervisor" ]; then
runtime+="-clh"
configuration+="-clh"
else
runtime+="-$1" runtime+="-$1"
configuration+="-$1" configuration+="-$1"
fi fi
fi
local runtime_table="plugins.cri.containerd.runtimes.$runtime" local runtime_table="plugins.cri.containerd.runtimes.$runtime"
local runtime_type="io.containerd.$runtime.v2" local runtime_type="io.containerd.$runtime.v2"
local options_table="$runtime_table.options" local options_table="$runtime_table.options"