Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: separate pki config and keys groups ......................................................................
packaging: setup: separate pki config and keys groups using separate pki config and keys for uninstall groups Change-Id: Ied09af0cb1ace07101629273746ed3eb820a78ee Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/config/ca.py M packaging/setup/plugins/ovirt-engine-setup/pki/ca.py 2 files changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/15014/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/ca.py b/packaging/setup/plugins/ovirt-engine-setup/config/ca.py index 2cb8481..d4633b2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/ca.py @@ -52,7 +52,14 @@ uninstall_files = [] self.environment[ osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS - ].addFiles('ca_pki', uninstall_files) + ].createGroup( + group='ca_config', + description='PKI configuration', + optional=True, + ).addFiles( + 'ca_config', + uninstall_files, + ) self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=( diff --git a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py index 070f938..44a4f7e8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py @@ -70,18 +70,6 @@ @plugin.event( stage=plugin.Stages.STAGE_SETUP, - ) - def _setupGroup(self): - self.environment[ - osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS - ].createGroup( - group='ca_pki', - description='PKI configuration and keys', - optional=True, - ) - - @plugin.event( - stage=plugin.Stages.STAGE_SETUP, condition=lambda self: not os.path.exists( osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT ) @@ -142,7 +130,11 @@ uninstall_files = [] self.environment[ osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS - ].addFiles( + ].createGroup( + group='ca_pki', + description='PKI keys', + optional=True, + ).addFiles( group='ca_pki', fileList=uninstall_files, ) -- To view, visit http://gerrit.ovirt.org/15014 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied09af0cb1ace07101629273746ed3eb820a78ee 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
