OpenBSDAms
/
deploy.pl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove DHCPD option, will need to run dhcpd per host for autoinstall

This commit is contained in:
mischa 2023-05-06 16:21:14 +02:00
parent 72cd5c13f2
commit 6a337bb11a
5 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_deploy.conf
View File

@ -22,7 +22,6 @@ VMDUSERS="vmdusers"
SWITCH="uplink_vlan931 uplink_vlan910"
INTERFACE="veb931 veb910"
# dhcpd.conf
#DHCPD="no"
ROUTER="46.23.93.1"
DNS="46.23.80.26"
SUBNET="46.23.93.0"

4
cease.sh
View File

@ -40,9 +40,7 @@ if vmctl show ${1%.txt} >/dev/null 2>&1; then
dig +short -x $(grep -A2 ${1%.txt} /etc/dhcpd.conf | awk '/fixed/ {print $2}' | tr -d ';')
remove.pl ${1}
deploy.pl
if [[ -z ${DHCPD} ]]; then
rcctl restart dhcpd
fi
rcctl restart dhcpd
vmctl reload
fi
fi

5
deploy.pl
View File

@ -198,7 +198,6 @@ sub render_install_conf {
my $jot_pass = qx(jot -rcs '' 20 46 125);
chomp($jot_pass);
my $_ipv4 = $vms{$vm_name}{'ipv4'} || "autoconf";
$_ipv4 = "autoconf" if $conf{'conf'}{'DHCPD'} eq "yes";
my $_ipv4_gateway = $vms{$vm_name}{'ipv4_gw'} || $conf{'conf'}{'ROUTER'};
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";
@ -364,12 +363,10 @@ my %vms;
my @files = glob "$conf{'conf'}{'VMS'}/*.txt";
%vms = get_variables('vms', @files);
$conf{'conf'}{'DHCPD'} = "yes" if (! $conf{'conf'}{'DHCPD'});
# run all functions
#debug_parse(\%conf, \%vms);
render_vm_conf(\%conf, \%vms);
render_dhcpd_conf(\%conf, \%vms) if $conf{'conf'}{'DHCPD'} eq "yes";
render_dhcpd_conf(\%conf, \%vms);
render_install_conf(\%conf, \%vms);
create_accounts(\%conf, \%vms);
create_img_files(\%conf, \%vms);

16
launch.sh
View File

@ -56,12 +56,10 @@ if [[ "${SERVER}" == server* ]] || [[ "${SERVER}" == mega* ]]; then
fi
deploy.pl
sleep 10
if [[ -z ${DHCPD} ]]; then
rcctl restart dhcpd
fi
sleep 5
rcctl restart dhcpd
vmctl reload
sleep 10
sleep 5
mkfifo -m 600 /tmp/pipe_${1}
install -g mischa -m 600 -o mischa /dev/null ${LOGS}/${1}.log
@ -88,12 +86,10 @@ done > /tmp/pipe_${1} 2> ${LOGS}/${1}.log
echo "completed"
deploy.pl
sleep 10
if [[ -z ${DHCPD} ]]; then
rcctl restart dhcpd
fi
sleep 5
rcctl restart dhcpd
vmctl reload
sleep 10
sleep 5
echo "booting ${INSTANCE}"

16
relaunch.sh
View File

@ -44,12 +44,10 @@ if [[ -z ${INSTANCE} ]]; then
fi
deploy.pl
sleep 10
if [[ -z ${DHCPD} ]]; then
rcctl restart dhcpd
fi
sleep 5
rcctl restart dhcpd
vmctl reload
sleep 10
sleep 5
mkfifo -m 600 /tmp/pipe_${1}
install -g mischa -m 600 -o mischa /dev/null ${LOGS}/${1}.log
@ -76,12 +74,10 @@ done > /tmp/pipe_${1} 2> ${LOGS}/${1}.log
echo "completed"
deploy.pl
sleep 10
if [[ -z ${DHCPD} ]]; then
rcctl restart dhcpd
fi
sleep 5
rcctl restart dhcpd
vmctl reload
sleep 10
sleep 5
echo "booting ${INSTANCE}"