Use the same folder path on both terraform and vagrant

Better to have everything look the same for easier diffing/comparing vs having the tool name in the path. Signed-off-by: Manuel Mendez <[email protected]>
tinkerbell · Mar 18, 2022 · 5770ae6 · 5770ae6
1 parent 970eb48
commit 5770ae6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/deploy/terraform/setup.sh b/deploy/terraform/setup.sh
@@ -109,8 +109,8 @@ make_host_gw_server() {
 }
 
 extract_compose_files() {
-	mkdir -p /root/sandbox
-	tar -zxvf /root/compose.tar.gz -C /root/sandbox
+	mkdir -p /sandbox
+	tar -zxvf /root/compose.tar.gz -C /sandbox
 }
 
 setup_compose_env_overrides() {
@@ -121,22 +121,22 @@ setup_compose_env_overrides() {
 		TINKERBELL_HARDWARE_MANIFEST=/manifests/hardware/hardware-equinix-metal.json
 	EOF
 	for line in "${lines[@]}"; do
-		grep -q "$line" /root/sandbox/compose/.env && continue
-		echo "$line" >>/root/sandbox/compose/.env
+		grep -q "$line" /sandbox/compose/.env && continue
+		echo "$line" >>/sandbox/compose/.env
 	done
 }
 
 create_tink_helper_script() {
 	cat >/usr/local/bin/tink <<-'EOF'
 		#!/usr/bin/env bash
 
-		exec docker-compose -f /root/sandbox/compose/docker-compose.yml exec tink-cli tink "$@"
+		exec docker-compose -f /sandbox/compose/docker-compose.yml exec tink-cli tink "$@"
 	EOF
 	chmod +x /usr/local/bin/tink
 }
 
 tweak_bash_interactive_settings() {
-	grep -q 'cd /root/sandbox/compose' ~root/.bashrc || echo 'cd /root/sandbox/compose' >>~root/.bashrc
+	grep -q 'cd /sandbox/compose' ~root/.bashrc || echo 'cd /sandbox/compose' >>~root/.bashrc
 	readarray aliases <<-EOF
 		dc=docker-compose
 	EOF
@@ -161,7 +161,7 @@ main() {
 
 	extract_compose_files
 	setup_compose_env_overrides "$worker_mac"
-	docker-compose -f /root/sandbox/compose/docker-compose.yml up -d
+	docker-compose -f /sandbox/compose/docker-compose.yml up -d
 
 	create_tink_helper_script
 	tweak_bash_interactive_settings

diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile
@@ -11,7 +11,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.define "provisioner" do |provisioner|
     provisioner.vm.box = "generic/ubuntu2004"
-    provisioner.vm.synced_folder "../compose/", "/vagrant/compose/"
+    provisioner.vm.synced_folder "../compose/", "/sandbox/compose/"
     provisioner.vm.network "private_network", ip: PROVISIONER_IP,
                                               libvirt__network_name: "tink_network",
                                               libvirt__host_ip: "192.168.56.1",
@@ -22,13 +22,13 @@ Vagrant.configure("2") do |config|
     provisioner.vm.provider "virtualbox" do |v, override|
       v.memory = 2048
       v.cpus = 2
-      override.vm.synced_folder "../compose/", "/vagrant/compose/"
+      override.vm.synced_folder "../compose/", "/sandbox/compose/"
     end
 
     provisioner.vm.provider "libvirt" do |l, override|
       l.memory = 2048
       l.cpus = 2
-      override.vm.synced_folder "../compose/", "/vagrant/compose/", type: "rsync"
+      override.vm.synced_folder "../compose/", "/sandbox/compose/", type: "rsync"
     end
 
     provisioner.vm.provision :shell, path: "setup.sh", args: [PROVISIONER_IP, MACHINE1_IP]

diff --git a/deploy/vagrant/setup.sh b/deploy/vagrant/setup.sh
@@ -40,15 +40,15 @@ setup_compose_env_overrides() {
 	local host_addr=$1
 	local worker_addr=$2
 	if lsblk | grep -q vda; then
-		sed -i 's|sda|vda|g' /vagrant/compose/create-tink-records/manifests/template/ubuntu.yaml
+		sed -i 's|sda|vda|g' /sandbox/compose/create-tink-records/manifests/template/ubuntu.yaml
 	fi
 	readarray lines <<-EOF
 		TINKERBELL_HOST_IP="$host_addr"
 		TINKERBELL_CLIENT_IP="$worker_addr"
 	EOF
 	for line in "${lines[@]}"; do
-		grep -q "$line" /vagrant/compose/.env && continue
-		echo "$line" >>/vagrant/compose/.env
+		grep -q "$line" /sandbox/compose/.env && continue
+		echo "$line" >>/sandbox/compose/.env
 	done
 }
 
@@ -57,13 +57,13 @@ create_tink_helper_script() {
 	cat >~vagrant/.local/bin/tink <<-'EOF'
 		#!/usr/bin/env bash
 
-		exec docker-compose -f /vagrant/compose/docker-compose.yml exec tink-cli tink "$@"
+		exec docker-compose -f /sandbox/compose/docker-compose.yml exec tink-cli tink "$@"
 	EOF
 	chmod +x ~vagrant/.local/bin/tink
 }
 
 tweak_bash_interactive_settings() {
-	grep -q 'cd /vagrant/compose' ~vagrant/.bashrc || echo 'cd /vagrant/compose' >>~vagrant/.bashrc
+	grep -q 'cd /sandbox/compose' ~vagrant/.bashrc || echo 'cd /sandbox/compose' >>~vagrant/.bashrc
 	readarray aliases <<-EOF
 		dc=docker-compose
 	EOF
@@ -83,7 +83,7 @@ main() {
 	setup_layer2_network "$host_addr"
 
 	setup_compose_env_overrides "$host_addr" "$worker_addr"
-	docker-compose -f /vagrant/compose/docker-compose.yml up -d
+	docker-compose -f /sandbox/compose/docker-compose.yml up -d
 
 	create_tink_helper_script
 	tweak_bash_interactive_settings