xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-04 17:28:18 +00:00
Code Issues Releases Wiki Activity

Fix esxiready and do single reboot install

Browse Source
This commit is contained in:
Jarrod Johnson
2018-08-02 13:38:16 -04:00
parent 6931200dca
commit 636b6b8cd1
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/esx.pm
View File

@@ -181,8 +181,9 @@ sub preprocess_request {
} elsif ($request->{command}->[0] eq 'mknetboot'
or $request->{command}->[0] eq 'mkinstall') {
return [$request];
}
xCAT::Common::usage_noderange($request, $callback);
} elsif ($request->{command}->[0] ne 'esxiready') {
xCAT::Common::usage_noderange($request, $callback);
}
if ($request->{_xcatpreprocessed} and $request->{_xcatpreprocessed}->[0] == 1) { return [$request]; }

20
xCAT-server/share/xcat/install/esxi/hypervisor.tmpl
View File

@@ -48,20 +48,18 @@ done
echo -e "<xcatrequest>\n<command>nextdestiny</command>\n</xcatrequest>" | /bin/openssl s_client -quiet -connect $xcatd:3001 2>&1 | tee /tmp/foo.log
%firstboot --interpreter=busybox
# enable SSH on next boot....
chkconfig SSH on
chkconfig ESXShell on
esxcli system settings advanced set --int-value 0 --option /VMFS3/EnableBlockDelete
/etc/init.d/SSH start
#chkconfig ESXShell on
#/etc/init.d/ESXShell start
esxcli system settings advanced set --int-value 1 --option /UserVars/SuppressShellWarning
esxcli network ip set -e y
esxcli network firewall ruleset set -r DHCPv6 -e y
esxcli network firewall ruleset set -r sshServer -e y
esxcli network ip interface ipv6 set -i vmk0 -d y
cat > /etc/init.d/xcatesxiready << EOF
echo -e "<xcatrequest>\n<command>esxiready</command>\n</xcatrequest>" | /bin/openssl s_client -quiet -connect $xcatd:3001 2>&1 | tee /tmp/foo.log
chkconfig --del xcatesxiready
rm -rf /etc/init.d/xcatesxiready
EOF
chmod +x xcatesxiready
chkconfig --add xcatesxiready
reboot
#The following (replacing $xcatd with your address) enables esxi install to trigger a vcenter join automatically.
#uncomment the three lines and change $xcatd to your address for this functionality.
#and chtab priority=3.1 policy.commands=esxiready policy.rule=allow
#esxcli network firewall set -e 0
#echo -e "<xcatrequest>\n<command>esxiready</command>\n</xcatrequest>" | /bin/openssl s_client -quiet -connect $xcatd:3001 2>&1 | tee /tmp/foo.log
#esxcli network firewall set -e 1