From 53e8b80ed36a9193627862427fa224ed38375d3a Mon Sep 17 00:00:00 2001 From: Martin Hiner Date: Mon, 21 Nov 2022 18:38:57 +0100 Subject: Add container engine option to scripts This patch add a way to choose container engine inside tool and test scripts. This is in preparation for Podman introduction but still leaves Docker as default container engine. Signed-off-by: Martin Hiner Change-Id: I395d2bdb0dfb4b325b6ad197c8893c8a0f768324 --- tests/deploy-tenks.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/deploy-tenks.sh') diff --git a/tests/deploy-tenks.sh b/tests/deploy-tenks.sh index b212d38eb..022cec229 100755 --- a/tests/deploy-tenks.sh +++ b/tests/deploy-tenks.sh @@ -24,7 +24,7 @@ function deploy_tenks_logged { # Script installed onto the host to fool tenks into using the containerised # Open vSwitch rather than installing its own. -sudo docker exec openvswitch_vswitchd ovs-vsctl "\$@" +sudo ${CONTAINER_ENGINE} exec openvswitch_vswitchd ovs-vsctl "\$@" EOF sudo chmod 755 /usr/bin/ovs-vsctl @@ -57,7 +57,7 @@ EOF function deploy_tenks { echo "Configuring virtual bare metal via Tenks" - deploy_tenks_logged > /tmp/logs/ansible/deploy-tenks 2>&1 + deploy_tenks_logged $1 > /tmp/logs/ansible/deploy-tenks 2>&1 result=$? if [[ $result != 0 ]]; then echo "Deploying tenks failed. See ansible/deploy-tenks for details" @@ -67,4 +67,4 @@ function deploy_tenks { return $result } -deploy_tenks +deploy_tenks $1 -- cgit v1.2.3