Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: cleaning up ISO domain directory ......................................................................
packaging: setup: cleaning up ISO domain directory Allow the admin to remove from ISO domain directory the content added by engine-setup-2 when running engine-cleanup-2. Change-Id: Ic7902968c8290c438e5aed2e63a0a63c1f446670 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py M packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py 2 files changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/14984/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py b/packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py index f7fba9a..3cd495a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py @@ -113,6 +113,17 @@ return sd_uuid def _prepare_new_domain(self, path): + uninstall_files = [] + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].createGroup( + group='iso_domain', + description='ISO domain content', + optional=True + ).addFiles( + group='iso_domain', + fileList=uninstall_files, + ) self.logger.debug('Generating a new uuid for ISO domain') sdUUID = str(uuid.uuid4()) description = self.environment[ @@ -143,9 +154,7 @@ osetupcons.SystemEnv.USER_VDSM ], dgroup=self.environment[osetupcons.SystemEnv.GROUP_KVM], - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) #Create dom_md directory tree @@ -164,14 +173,9 @@ osetupcons.SystemEnv.USER_VDSM ], dgroup=self.environment[osetupcons.SystemEnv.GROUP_KVM], - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) - self.environment[ - osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES - ].append(filename) metadata = os.path.join(domMdDir, 'metadata') self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( @@ -183,14 +187,9 @@ downer=self.environment[osetupcons.SystemEnv.USER_VDSM], dgroup=self.environment[osetupcons.SystemEnv.GROUP_KVM], content=self._generate_md_content(sdUUID, description), - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) - self.environment[ - osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES - ].append(metadata) return sdUUID diff --git a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py index f9ae2fb..f722222 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py +++ b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py @@ -88,6 +88,14 @@ Load files (iso, vfd) from existing rpms to the NFS ISO domain TODO: use engine-iso-uploader when it will support local destinations """ + uninstall_files = [] + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].addFiles( + group='iso_domain', + fileList=uninstall_files, + ) + targetDir = self.environment[ osetupcons.ConfigEnv.ISO_DOMAIN_STORAGE_DIR ] @@ -111,6 +119,7 @@ ) ) shutil.copyfile(filename, targetFile) + uninstall_files.append(targetFile) os.chmod(targetFile, 0o644) os.chown( targetFile, -- To view, visit http://gerrit.ovirt.org/14984 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7902968c8290c438e5aed2e63a0a63c1f446670 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
