From dfc289b154bb2939b9910fdf8029e061ede48f9b Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 15 Jul 2020 11:12:27 -0400 Subject: [PATCH] Allow osdeploy initialize -p by itself It seems a rational thing to do. --- confluent_server/bin/osdeploy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_server/bin/osdeploy b/confluent_server/bin/osdeploy index 47e97b64..baf77dfd 100644 --- a/confluent_server/bin/osdeploy +++ b/confluent_server/bin/osdeploy @@ -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'])