From 3edb629bd23a323f91aadbea1586c0c681449af8 Mon Sep 17 00:00:00 2001
From: mischa <mischa@rx.high5.nl>
Date: Wed, 3 May 2023 09:33:11 +0200
Subject: [PATCH] added option to predfine ipv6

---
 deploy.pl    | 7 ++++---
 vms/vm01.txt | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deploy.pl b/deploy.pl
index 0a2453e..224e88e 100755
--- a/deploy.pl
+++ b/deploy.pl
@@ -33,6 +33,7 @@
 # 2021/10/28 changed: autoinstall from dhcp to autoconf
 # 2022/12/01 added: boot device net, move away from expect()
 # 2023/05/02 added: enable flag, allow for VMs to auto-start
+# 2023/05/03 added: predefined IPv6 address, gw
 #
 use 5.024;
 use strict;
@@ -157,7 +158,7 @@ sub render_dhcpd_conf {
 		my $_disk = $conf{'conf'}{'IMAGES'} . "/" . $_instance . "." . $_disk_format;
 		my $_mac = $vms{$vm_name}{'mac'} || $conf{'conf'}{'MAC_PREFIX'} . ":" . $vms{$vm_name}{'vm_number'};
 		my $_ip = $vms{$vm_name}{'ip'} || $conf{'conf'}{'IP_PREFIX'} . "." . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
-		my $_ipv6 = $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::" . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
+		my $_ipv6 = $vms{$vm_name}{'ipv6'} || $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::" . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
 		my $_hostname = $vms{$vm_name}{'hostname'};
 
 		printf $fh_dhcpd "\thost %s {\n", $_instance;
@@ -195,8 +196,8 @@ sub render_install_conf {
 			my $_hostname = $vms{$vm_name}{'hostname'};
 			my $jot_pass = qx(jot -rcs '' 20 46 125);
 			chomp($jot_pass);
-			my $_ipv6 = $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::" . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
-			my $_ipv6_gateway = $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::1";
+			my $_ipv6 = $vms{$vm_name}{'ipv6'} || $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::" . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
+			my $_ipv6_gateway = $vms{$vm_name}{'ipv6_gw'} || $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::1";
 			my $_username = $vms{$vm_name}{'username'};
 			my $_sshkey = $vms{$vm_name}{'sshkey'};
 
diff --git a/vms/vm01.txt b/vms/vm01.txt
index 8262c96..bf37453 100644
--- a/vms/vm01.txt
+++ b/vms/vm01.txt
@@ -1,5 +1,7 @@
 mac="fe:e1:ab:dd:73:a4"
-ip="192.168.1.1"
+ip="192.168.1.112"
+ipv6="2a03:6000:1::112"
+ipv6_gw="2a03:6000:1::1"
 owner="testuser1"
 date="2018/04/02"
 payment="74"