xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-07-06 21:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Revise the esxi tar strategy

Browse Source 
Finally, it has been ascertained
that ESXi rejecting the tar
was due to not having directories
explicitly listed, not because of
forbidding new paths or compression.
This commit is contained in:
Jarrod Johnson
2020-06-10 10:37:14 -04:00
parent facba645c5
commit 783c6ce7b6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
View File

@ -1,3 +1,4 @@
#!/bin/sh
# copernicus is hard coded, easier to script a fake sysfs
uuid=$(vsish -e get /hardware/bios/dmiInfo|grep -A15 UUID|sed -e 's/.*://'|sed -e ':a;N;$!ba;s/\n//g' | sed -e 's/ *0x//g')
uuid=${uuid:0:8}-${uuid:8:4}-${uuid:12:4}-${uuid:16:4}-${uuid:20:12}
@ -11,7 +12,9 @@ while ! grep NODENAME /etc/confluent/confluent.info; do
done
node=$(grep NODENAME: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
mgr=$(grep MANAGER: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
/opt/confluent/bin/clortho $node $mgr > /etc/confluent/confluent.apikey
cp /opt/confluent/bin/clortho /clortho
/clortho $node $mgr > /etc/confluent/confluent.apikey
cat /tls/*.pem > /etc/confluent/ca.pem
/opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/^profile: //')
/opt/confluent/bin/apiclient /confluent-public/os/$profile/kickstart > /etc/confluent/ks.cfg
@ -21,5 +24,4 @@ chmod +x /tmp/makeksnet
rootpw=$(grep ^rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //')
echo rootpw --iscrypted $rootpw > /tmp/rootpw
export BOOT_OPTIONS=ks=/etc/confluent/ks.cfg
exec /bin/install
exec /bin/install

2
confluent_server/bin/osimage
View File

@ -138,7 +138,7 @@ def initialize(cmdset):
sys.exit(1)
os.rename(tmpname, '/var/lib/confluent/public/site/initramfs.cpio')
tmptarname = tmpname.replace('cpio', 'tgz')
tarcmd = ['tar', '--transform=s|^|etc/|', '-czf', tmptarname] + topack
tarcmd = ['tar', '-czf', tmptarname] + topack
subprocess.check_call(tarcmd)
os.chdir(opath)
os.rename(tmptarname, '/var/lib/confluent/public/site/initramfs.tgz')