Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: Making separate WSP CSR available also in temp file ......................................................................
packaging: setup: Making separate WSP CSR available also in temp file Making CSR for a WebsocketProxy on a sperate host available also in a temp file. Fixing name and file permission of default cert. Change-Id: If517c577ead43e604442c7d468f034c2c8eaf276 Bug-Url: https://bugzilla.redhat.com/1115993 Signed-off-by: Simone Tiraboschi <[email protected]> (cherry picked from commit 839a391dd70120027327288a640cc83d7647f4fc) --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py 4 files changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/31752/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py index 0f8904e..b78e64f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py @@ -205,7 +205,7 @@ { 'name': 'WebSocketProxy', 'value': '%s:%s' % ( - 'localhost', + self.environment[osetupcons.ConfigEnv.FQDN], osetupcons.Defaults.DEFAULT_WEBSOCKET_PROXY_PORT, ), }, 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 4225df7..6271a53 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 @@ -380,6 +380,10 @@ for f in ( oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_STORE, oenginecons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE, + oenginecons.FileLocations. + OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_KEY, + oenginecons.FileLocations. + OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_STORE, ): os.chown( f, diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py index 85617a3..4950bf2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py @@ -185,8 +185,9 @@ def _misc_VDC(self): self.dialog.note( text=_( - "Please execute this command on the engine host: \n" - "engine-config -s WebSocketProxy={fqdn}:{port}\n\n" + "\nPlease execute this command on the engine host: \n" + " engine-config -s WebSocketProxy={fqdn}:{port}\n" + "and than restart the engine service to make it effective\n\n" ).format( fqdn=self.environment[osetupcons.ConfigEnv.FQDN], port=self.environment[ diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py index a030684..9e86a7a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py @@ -22,6 +22,7 @@ import contextlib import os import urllib2 +import tempfile import gettext @@ -68,6 +69,7 @@ self._need_key = False self._need_cert = False self._on_separate_h = False + self._csr_file = None @plugin.event( stage=plugin.Stages.STAGE_INIT, @@ -129,6 +131,20 @@ note=_( '\n\nPlease issue WebSocket Proxy certificate based ' 'on this certificate request\n\n' + ), + ) + self._csr_file = tempfile.NamedTemporaryFile( + mode='w', + delete=False, + ) + self._csr_file.write(req) + self._csr_file.close() + self.dialog.note( + text=_( + "\nThe certificate request is also available at:\n" + "{fname}\n\n" + ).format( + fname=self._csr_file.name, ), ) self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( @@ -254,5 +270,13 @@ ) ) + @plugin.event( + stage=plugin.Stages.STAGE_CLEANUP, + ) + def _cleanup(self): + if self._csr_file is not None: + if os.path.exists(self._csr_file.name): + os.unlink(self._csr_file.name) + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/31752 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If517c577ead43e604442c7d468f034c2c8eaf276 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
