Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Do not show ISO/NFS data if exists ......................................................................
packaging: setup: Do not show ISO/NFS data if exists Set env so that if ISO domain already exists, we do not show nfs-related info in "CONFIGURATION PREVIEW". Bug-Url: https://bugzilla.redhat.com/1056777 Change-Id: I7e8a29c93bd0700f13d5eaa248ba719faa940d83 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/legacy/isodomain.py M packaging/setup/plugins/ovirt-engine-setup/system/nfs.py 2 files changed, 4 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/25258/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/isodomain.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/isodomain.py index 70bae5c..5874630 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/legacy/isodomain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/isodomain.py @@ -96,28 +96,7 @@ ] = True self.environment[ osetupcons.SystemEnv.NFS_CONFIG_ENABLED - ] = True - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NFS_MOUNT_POINT - ] = path - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NAME - ] = domain['storage_name'] - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_SD_UUID - ] = domain['id'] - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_STORAGE_DIR - ] = os.path.join( - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NFS_MOUNT_POINT - ], - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_SD_UUID - ], - 'images', - osetupcons.Const.ISO_DOMAIN_IMAGE_UID, - ) + ] = None break @plugin.event( diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py index f33bb1a..88920a6 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py +++ b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py @@ -102,7 +102,9 @@ osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE, osetupcons.Stages.DIALOG_TITLES_S_SYSTEM, ), - condition=lambda self: self._enabled, + condition=lambda self: self._enabled and not self.environment[ + osetupcons.ConfigEnv.ISO_DOMAIN_EXISTS + ], ) def _customization(self): """ -- To view, visit http://gerrit.ovirt.org/25258 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e8a29c93bd0700f13d5eaa248ba719faa940d83 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
