Better handle errors in TFTP bootstrap
This commit is contained in:
parent
7230ba6121
commit
cac2e2a2b8
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
import os.path
|
import os.path
|
||||||
import shutil
|
import shutil
|
||||||
|
from subprocess import run
|
||||||
|
from sys import stdout, stderr
|
||||||
|
|
||||||
import pvcbootstrapd.lib.notifications as notifications
|
import pvcbootstrapd.lib.notifications as notifications
|
||||||
|
|
||||||
|
@ -28,9 +30,11 @@ import pvcbootstrapd.lib.notifications as notifications
|
||||||
def build_tftp_repository(config):
|
def build_tftp_repository(config):
|
||||||
# Generate an installer config
|
# Generate an installer config
|
||||||
build_cmd = f"{config['ansible_path']}/pvc-installer/buildpxe.sh -o {config['tftp_root_path']} -u {config['deploy_username']}"
|
build_cmd = f"{config['ansible_path']}/pvc-installer/buildpxe.sh -o {config['tftp_root_path']} -u {config['deploy_username']}"
|
||||||
|
build_cmd = [ f"{config['ansible_path']}/pvc-installer/buildpxe.sh", "-o", config['tftp_root_path'], "-u", config['deploy_username'] ]
|
||||||
print(f"Building TFTP contents via pvc-installer command: {build_cmd}")
|
print(f"Building TFTP contents via pvc-installer command: {build_cmd}")
|
||||||
notifications.send_webhook(config, "begin", f"Building TFTP contents via pvc-installer command: {build_cmd}")
|
notifications.send_webhook(config, "begin", f"Building TFTP contents via pvc-installer command: {' '.join(build_cmd)}")
|
||||||
os.system(build_cmd)
|
retcode = run(build_cmd, stdout=stdout, stderr=stderr)
|
||||||
|
return True if retcode == 0 else False
|
||||||
|
|
||||||
|
|
||||||
def init_tftp(config):
|
def init_tftp(config):
|
||||||
|
@ -46,5 +50,8 @@ def init_tftp(config):
|
||||||
f"{config['ansible_key_file']}.pub", f"{config['tftp_root_path']}/keys.txt"
|
f"{config['ansible_key_file']}.pub", f"{config['tftp_root_path']}/keys.txt"
|
||||||
)
|
)
|
||||||
|
|
||||||
build_tftp_repository(config)
|
result = build_tftp_repository(config)
|
||||||
|
if result:
|
||||||
notifications.send_webhook(config, "success", "First run: successfully initialized TFTP root and contents")
|
notifications.send_webhook(config, "success", "First run: successfully initialized TFTP root and contents")
|
||||||
|
else:
|
||||||
|
notifications.send_webhook(config, "failure", "First run: failed initialized TFTP root and contents; check pvcbootstrapd logs")
|
||||||
|
|
Loading…
Reference in New Issue