From 5b2197093d96091dad22c0c1e8741e441ea7b844 Mon Sep 17 00:00:00 2001 From: Matt Nikkel Date: Thu, 14 Jan 2021 22:41:46 -0500 Subject: [PATCH] Update Vagrant scripts to use hauler name --- vagrant-scripts/airgap.sh | 2 +- vagrant-scripts/k3s-install.sh | 2 +- vagrant-scripts/k3s-prep.sh | 2 +- vagrant-scripts/prep-all.sh | 2 +- vagrant-scripts/rke2-install.sh | 2 +- vagrant-scripts/rke2-prep.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vagrant-scripts/airgap.sh b/vagrant-scripts/airgap.sh index 342737a..017c345 100755 --- a/vagrant-scripts/airgap.sh +++ b/vagrant-scripts/airgap.sh @@ -3,7 +3,7 @@ set -x if [ "$#" -ne 1 ] || ( [ "$1" != "internet" ] && [ "$1" != "airgap" ] ); then echo \ -"Enable or disable internet access in k3ama's CentOS Vagrant machine. +"Enable or disable internet access in hauler's CentOS Vagrant machine. Usage: $0 internet $0 airgap" >&2 diff --git a/vagrant-scripts/k3s-install.sh b/vagrant-scripts/k3s-install.sh index 519488f..e7316c3 100755 --- a/vagrant-scripts/k3s-install.sh +++ b/vagrant-scripts/k3s-install.sh @@ -25,7 +25,7 @@ else fi LOCAL_IMAGES_FILEPATH=/var/lib/rancher/k3s/agent/images -ARTIFACT_DIR=/opt/k3ama/local-artifacts/k3s +ARTIFACT_DIR=/opt/hauler/local-artifacts/k3s mkdir -p ${LOCAL_IMAGES_FILEPATH} diff --git a/vagrant-scripts/k3s-prep.sh b/vagrant-scripts/k3s-prep.sh index 8acf433..4d1572f 100755 --- a/vagrant-scripts/k3s-prep.sh +++ b/vagrant-scripts/k3s-prep.sh @@ -6,7 +6,7 @@ # to the folder shared with the host machine. ################################################################################ -BASE_SHARED_DIR="/opt/k3ama" +BASE_SHARED_DIR="/opt/hauler" VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts" ARTIFACTS_DIR="${BASE_SHARED_DIR}/local-artifacts/k3s" diff --git a/vagrant-scripts/prep-all.sh b/vagrant-scripts/prep-all.sh index aad9892..ee5d0dc 100755 --- a/vagrant-scripts/prep-all.sh +++ b/vagrant-scripts/prep-all.sh @@ -1,6 +1,6 @@ #!/bin/sh -BASE_SHARED_DIR="/opt/k3ama" +BASE_SHARED_DIR="/opt/hauler" VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts" for script in ${VAGRANT_SCRIPTS_DIR}/*-prep.sh ; do diff --git a/vagrant-scripts/rke2-install.sh b/vagrant-scripts/rke2-install.sh index ed65930..7f85f86 100755 --- a/vagrant-scripts/rke2-install.sh +++ b/vagrant-scripts/rke2-install.sh @@ -5,7 +5,7 @@ # Install a default, bare rke2 cluster into the Vagrant machine ################################################################################ -BASE_SHARED_DIR="/opt/k3ama" +BASE_SHARED_DIR="/opt/hauler" VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts" RKE2_VERSION_DOCKER='v1.18.4-beta16-rke2' diff --git a/vagrant-scripts/rke2-prep.sh b/vagrant-scripts/rke2-prep.sh index 0baf359..5485183 100755 --- a/vagrant-scripts/rke2-prep.sh +++ b/vagrant-scripts/rke2-prep.sh @@ -6,7 +6,7 @@ # to the folder shared with the host machine. ################################################################################ -BASE_SHARED_DIR="/opt/k3ama" +BASE_SHARED_DIR="/opt/hauler" VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts" ARTIFACTS_DIR="${BASE_SHARED_DIR}/local-artifacts/rke2"