From d357fb400c84a9324f7fbc07f0085ee9618dd266 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 30 Sep 2020 11:19:40 -0400 Subject: [PATCH] vagrant: rename setup_docker* -> ensure_docker*_exists To better reflect new code. --- deploy/vagrant/scripts/tinkerbell.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/vagrant/scripts/tinkerbell.sh b/deploy/vagrant/scripts/tinkerbell.sh index b29f2b0d5..bb207fd9b 100644 --- a/deploy/vagrant/scripts/tinkerbell.sh +++ b/deploy/vagrant/scripts/tinkerbell.sh @@ -23,7 +23,7 @@ ensure_os_packages_exists() ( sudo apt-get install -y ${pkgs[@]} ) -setup_docker() ( +ensure_docker_exists() ( if command_exists docker; then return fi @@ -54,7 +54,7 @@ setup_docker() ( ; ) -setup_docker_compose() ( +ensure_docker-compose_exists() ( if command_exists docker-compose; then return fi @@ -95,8 +95,8 @@ main() ( export DEBIAN_FRONTEND=noninteractive ensure_os_packages_exists curl jq - setup_docker - setup_docker_compose + ensure_docker_exists + ensure_docker-compose_exists if [ ! -f ./envrc ]; then ./generate-envrc.sh eth1 >envrc