Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: Fixing websocket proxy key extraction ......................................................................
packaging: setup: Fixing websocket proxy key extraction As for other keys, extract websocket proxy key out of a transaction so it would be already available before the websocket proxy misc plugin. Change-Id: Id8a608383252b50a4d76f73b0bbbe8c3f6c9a692 Signed-off-by: Simone Tiraboschi <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py 1 file changed, 11 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/28886/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 247b9f2..a614121 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 @@ -304,30 +304,23 @@ ) ) - rc, stdout, stderr = self.execute( + self.execute( args=( oenginecons.FileLocations.OVIRT_ENGINE_PKI_PKCS12_EXTRACT, '--name=websocket-proxy', - '--passin=%s' % self.environment[ - oenginecons.PKIEnv.STORE_PASS - ], - '--key=-', + '--passin=%s' % ( + self.environment[oenginecons.PKIEnv.STORE_PASS], + ), + '--key=%s' % ( + oenginecons.FileLocations. + OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_KEY, + ), ), logStreams=False, ) - - self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( - filetransaction.FileTransaction( - oenginecons.FileLocations. - OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_KEY, - mode=0o600, - owner=self.environment[osetupcons.SystemEnv.USER_ENGINE], - enforcePermissions=True, - content=stdout, - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], - ) + uninstall_files.append( + oenginecons.FileLocations. + OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_KEY ) self.execute( -- To view, visit http://gerrit.ovirt.org/28886 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8a608383252b50a4d76f73b0bbbe8c3f6c9a692 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
