Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: pki: use local transaction when extracting PKCS#12 ......................................................................
packaging: setup: pki: use local transaction when extracting PKCS#12 as pki is non transactional, setup revert will create inconsistency between the PKCS#12 and the cert/key files. so write these files and commit them immediately as other transactions in this module. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1214860 Change-Id: Idd564f30ddc9c9bbfd79f70e0f89337ec0a65d61 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py 1 file changed, 23 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/41864/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py index 1a73b60..fdb77ce 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py @@ -123,29 +123,31 @@ logStreams=False, ) - self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( - filetransaction.FileTransaction( - name=os.path.join( - oenginecons.FileLocations.OVIRT_ENGINE_PKICERTSDIR, - '%s.cer' % name, - ), - content=self._extractPKCS12CertificateString(pkcs12), - mode=0o644, - modifiedList=uninstall_files, + localtransaction = transaction.Transaction() + with localtransaction: + localtransaction.append( + filetransaction.FileTransaction( + name=os.path.join( + oenginecons.FileLocations.OVIRT_ENGINE_PKICERTSDIR, + '%s.cer' % name, + ), + content=self._extractPKCS12CertificateString(pkcs12), + mode=0o644, + modifiedList=uninstall_files, + ) ) - ) - self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( - filetransaction.FileTransaction( - name=os.path.join( - oenginecons.FileLocations.OVIRT_ENGINE_PKIKEYSDIR, - '%s.key.nopass' % name, - ), - content=key, - mode=0o600, - owner=owner, - modifiedList=uninstall_files, + localtransaction.append( + filetransaction.FileTransaction( + name=os.path.join( + oenginecons.FileLocations.OVIRT_ENGINE_PKIKEYSDIR, + '%s.key.nopass' % name, + ), + content=key, + mode=0o600, + owner=owner, + modifiedList=uninstall_files, + ) ) - ) def _enrollCertificate(self, name, uninstall_files, keepKey=False): self.execute( -- To view, visit https://gerrit.ovirt.org/41864 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd564f30ddc9c9bbfd79f70e0f89337ec0a65d61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5.3 Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
