2
0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 19:10:10 +00:00

Allow osdeploy initialize -p by itself

It seems a rational thing to do.
This commit is contained in:
Jarrod Johnson 2020-07-15 11:12:27 -04:00
parent 77cfa7b45c
commit dfc289b154

View File

@ -117,7 +117,9 @@ def initialize(cmdset):
if cmdset.s:
didsomething = True
sshutil.initialize_ca()
if cmdset.p:
didsomething = True
install_tftp_content()
if not didsomething:
sys.stderr.write('Nothing was done, use initialize -i for '
'interactive mode, or see initialize -h for more options\n')
@ -162,8 +164,6 @@ def initialize(cmdset):
cacert = open(cafile, 'rb').read()
cacert = b'@cert-authority * ' + cacert
skh.write(cacert)
if cmdset.p:
install_tftp_content()
# ok, also need to think on how to handle getinstalldisk
if not os.path.exists('/etc/confluent/srvcert.pem'):
subprocess.check_call(['collective', 'gencert'])