From b023d8d634d85b2784f8082da926d81e8576b21a Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 7 Jan 2020 17:29:30 -0800 Subject: [PATCH] kata-deploy: use clh instead of cloud-hypervisor Let's use clh consistently. Signed-off-by: Eric Ernst --- kata-deploy/scripts/kata-deploy.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh index 139bc5dc64..35c5c6a81a 100755 --- a/kata-deploy/scripts/kata-deploy.sh +++ b/kata-deploy/scripts/kata-deploy.sh @@ -17,7 +17,7 @@ shims=( "fc" "qemu" "qemu-virtiofs" - "cloud-hypervisor" + "clh" ) # If we fail for any reason a message will be displayed @@ -148,13 +148,8 @@ function configure_containerd_runtime() { local runtime="kata" local configuration="configuration" if [ -n "${1-}" ]; then - if [ "$1" == "cloud-hypervisor" ]; then - runtime+="-clh" - configuration+="-clh" - else - runtime+="-$1" - configuration+="-$1" - fi + runtime+="-$1" + configuration+="-$1" fi local runtime_table="plugins.cri.containerd.runtimes.$runtime" local runtime_type="io.containerd.$runtime.v2"