diff options
| author | Martin Hiner <m.hiner@partner.samsung.com> | 2022-11-21 18:38:57 +0100 |
|---|---|---|
| committer | Martin Hiner <m.hiner@partner.samsung.com> | 2023-04-28 16:16:55 +0200 |
| commit | 53e8b80ed36a9193627862427fa224ed38375d3a (patch) | |
| tree | 14463dda4a87452345c37a1a5252d50db057bc12 /tests/deploy-tenks.sh | |
| parent | 92ddbdfbc190ec430f5527fcf867efec97e455b4 (diff) | |
| download | kolla-ansible-53e8b80ed36a9193627862427fa224ed38375d3a.tar.gz kolla-ansible-53e8b80ed36a9193627862427fa224ed38375d3a.zip | |
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 <m.hiner@partner.samsung.com>
Change-Id: I395d2bdb0dfb4b325b6ad197c8893c8a0f768324
Diffstat (limited to 'tests/deploy-tenks.sh')
| -rwxr-xr-x | tests/deploy-tenks.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |