openstack
/
manila
Code Issues Proposed changes

Merge "Update NFS helper restart" into stable/rocky

This commit is contained in:
Zuul 2020-07-25 00:36:44 +00:00 committed by Gerrit Code Review
parent 93df7fb072 92ea44b393
commit 7fa8eb4136
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manila/share/drivers/helpers.py
View File

@ -344,11 +344,12 @@ class NFSHelper(NASHelperBase):
self._ssh_exec(server, sync_cmd)
self._ssh_exec(server, ['sudo', 'exportfs', '-a'])
out, _ = self._ssh_exec(
server, ['sudo', 'service', 'nfs-kernel-server', 'status'],
server,
['sudo', 'systemctl', 'is-active', 'nfs-kernel-server'],
check_exit_code=False)
if "not" in out:
if "inactive" in out:
self._ssh_exec(
server, ['sudo', 'service', 'nfs-kernel-server', 'restart'])
server, ['sudo', 'systemctl', 'restart', 'nfs-kernel-server'])
def _get_export_location_template(self, export_location_or_path):
path = export_location_or_path.split(':')[-1]