Sandro Bonazzola has uploaded a new change for review. Change subject: sanlock: support for Gluster domains ......................................................................
sanlock: support for Gluster domains sanlock lease creation and domain monitoring didn't work on domains using glusterfs. Now the right paths for glusterfs domains are used. Change-Id: I723604e67906abfe2c7618821911cdf43f133a58 Bug-Url: https://bugzilla.redhat.com/1023962 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M src/plugins/ovirt-hosted-engine-setup/sanlock/lockspace.py M src/plugins/ovirt-hosted-engine-setup/storage/storage.py 2 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/17/20617/1 diff --git a/src/plugins/ovirt-hosted-engine-setup/sanlock/lockspace.py b/src/plugins/ovirt-hosted-engine-setup/sanlock/lockspace.py index 288e1ce..e5ca104 100644 --- a/src/plugins/ovirt-hosted-engine-setup/sanlock/lockspace.py +++ b/src/plugins/ovirt-hosted-engine-setup/sanlock/lockspace.py @@ -53,13 +53,19 @@ """ Return path of storage domain holding engine vm """ - domains = glob.glob( - os.path.join( + domain_path = os.path.join( + ohostedcons.FileLocations.SD_MOUNT_PARENT_DIR, + '*', + self.environment[ohostedcons.StorageEnv.SD_UUID], + ) + if self.environment[ohostedcons.StorageEnv.DOMAIN_TYPE] == 'glusterfs': + domain_path = os.path.join( ohostedcons.FileLocations.SD_MOUNT_PARENT_DIR, + 'glusterSD', '*', self.environment[ohostedcons.StorageEnv.SD_UUID], ) - ) + domains = glob.glob(domain_path) if not domains: raise RuntimeError( _( diff --git a/src/plugins/ovirt-hosted-engine-setup/storage/storage.py b/src/plugins/ovirt-hosted-engine-setup/storage/storage.py index 6016ea2..2fe70aa 100644 --- a/src/plugins/ovirt-hosted-engine-setup/storage/storage.py +++ b/src/plugins/ovirt-hosted-engine-setup/storage/storage.py @@ -114,13 +114,19 @@ """ Return path of storage domain holding engine vm """ - domains = glob.glob( - os.path.join( + domain_path = os.path.join( + ohostedcons.FileLocations.SD_MOUNT_PARENT_DIR, + '*', + self.environment[ohostedcons.StorageEnv.SD_UUID], + ) + if self.environment[ohostedcons.StorageEnv.DOMAIN_TYPE] == 'glusterfs': + domain_path = os.path.join( ohostedcons.FileLocations.SD_MOUNT_PARENT_DIR, + 'glusterSD', '*', self.environment[ohostedcons.StorageEnv.SD_UUID], ) - ) + domains = glob.glob(domain_path) if not domains: raise RuntimeError( _( -- To view, visit http://gerrit.ovirt.org/20617 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I723604e67906abfe2c7618821911cdf43f133a58 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
