Skip to content

Commit 1e59400

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 0e2d868 commit 1e59400

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
@@ -55,16 +55,12 @@ Vagrant.configure("2") do |config|
5555
SCRIPT
5656

5757
provisioner.vm.provision "shell", name: "Setup provider specific overrides", inline: <<-SCRIPT.gsub(/^ {6}/, "")
58-
manifest_suffix=""
5958
if lsblk | grep -q vda; then
60-
# assuming vda is only in libvirt, temporary
61-
manifest_suffix=-libvirt
59+
sed -i 's|sda|vda|g' /vagrant/compose/create-tink-records/manifests/templates/ubuntu.yaml
6260
fi
6361
read -r -d '' lines <<-'EOF'
6462
TINKERBELL_HOST_IP=#{PROVISIONER_IP}
6563
TINKERBELL_CLIENT_IP=#{MACHINE1_IP}
66-
TINKERBELL_HARDWARE_MANIFEST="/manifests/hardware/hardware$manifest_suffix.json"
67-
TINKERBELL_TEMPLATE_MANIFEST="/manifests/template/ubuntu$manifest_suffix.yaml"
6864
EOF
6965
while read -r line; do
7066
grep -q "$line" /vagrant/compose/.env && continue

0 commit comments

Comments
 (0)