jgaunt/truenas-kmip-unlocker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added logic to remove jails service restart before we have selected the jail storage pool

Browse Source
This commit is contained in:
jgaunt
2023-07-26 15:23:00 -04:00
parent dac79ffa7c
commit e7db02dce3
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
truenas_kmip_unlock.py
View File

@@ -457,6 +457,9 @@ if __name__ == '__main__':
services_to_restart = request('pool/unlock_services_restart_choices', api_key, "POST", pool['id'])['response']
first = True
for service_to_restart in services_to_restart:
if service_to_restart == "jails":
logger.debug('Skipping adding the {} service'.format(services_to_restart[service_to_restart]))
continue
if first:
pool_services = "'{}'".format(service_to_restart)
first = False
@@ -484,6 +487,9 @@ if __name__ == '__main__':
logger.info('Restarting services')
services_to_restart = request('pool/unlock_services_restart_choices', api_key, "POST", pool['id'])['response']
for service_to_restart in services_to_restart:
if service_to_restart == "jails":
logger.debug('Skipping restarting the {} service'.format(services_to_restart[service_to_restart]))
continue
logger.debug('Restarting the {} service'.format(services_to_restart[service_to_restart]))
response = request('service/restart', api_key, 'POST', {'service': service_to_restart})
if response['ok']:
@@ -500,6 +506,14 @@ if __name__ == '__main__':
response = request('jail/activate', api_key, 'POST', '{}'.format(jail_storage_pool))
if response['ok']:
logger.info('Successfully set jail storage pool to {}'.format(jail_storage_pool))
# restart the jails service
jails_service_name = 'jails'
logger.debug('Restarting the {} service'.format(jails_service_name))
response = request('service/restart', api_key, 'POST', {'service': jails_service_name})
if response['ok']:
logger.debug('Service {} was restarted successfully'.format(jails_service_name))
else:
logger.error('Service {} was NOT restarted'.format(jails_service_name))
# start any jails that are set to start on boot but are most likely on an encrypted pool
API_JAILS = request('jail', api_key)['response']
for jail in API_JAILS: