Skip to content

Commit db19550

Browse files
committed
vagrant: Get rid of -libvirt files
The differences between libvirt and virtualbox are actually pretty minor and not worth carrying different files for each. The template just needs sda -> vda and the hardware.json differed only by the gateway, which seems isn't even necessary. Signed-off-by: Manuel Mendez <[email protected]>
1 parent 5b59819 commit db19550

File tree

3 files changed

+1
-120
lines changed

3 files changed

+1
-120
lines changed

deploy/compose/create-tink-records/manifests/hardware/hardware-libvirt.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

deploy/compose/create-tink-records/manifests/template/ubuntu-libvirt.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

deploy/vagrant/Vagrantfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,12 @@ Vagrant.configure("2") do |config|
5959

6060
provisioner.vm.provision "shell", name: "Setup provider specific overrides", inline: <<-SCRIPT.gsub(/^ {6}/, "")
6161
set -x
62-
manifest_suffix=""
6362
if lsblk | grep -q vda; then
64-
# assuming vda is only in libvirt, temporary
65-
manifest_suffix=-libvirt
63+
sed -i 's|sda|vda|g' /vagrant/compose/create-tink-records/manifests/template/ubuntu.yaml
6664
fi
6765
read -r -d '' lines <<-'EOF'
6866
TINKERBELL_HOST_IP=#{PROVISIONER_IP}
6967
TINKERBELL_CLIENT_IP=#{MACHINE1_IP}
70-
TINKERBELL_HARDWARE_MANIFEST="/manifests/hardware/hardware$manifest_suffix.json"
71-
TINKERBELL_TEMPLATE_MANIFEST="/manifests/template/ubuntu$manifest_suffix.yaml"
7268
EOF
7369
while read -r line; do
7470
grep -q "$line" /vagrant/compose/.env && continue

0 commit comments

Comments
 (0)