Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: update firewall for all services ......................................................................
packaging: setup: update firewall for all services Update the firewall for websocket_proxy and postgresql not only during setup. Bug-Url: https://bugzilla.redhat.com/1024707 Change-Id: If3c1a634b2e8539ebd604205b5487290c8d8a1a9 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py M packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py 3 files changed, 47 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/20737/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 376f277..3f860e3 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -530,6 +530,8 @@ 'osetup.net.firewallmanager.templates.available' CONFIG_DB_CREDENTIALS = 'osetup.config.database.credentials' CONFIG_PROTOCOLS_CUSTOMIZATION = 'osetup.config.protocols.customization' + CONFIG_WEBSOCKET_PROXY_CUSTOMIZATION = \ + 'setup.config.websocket-proxy.customization' CONFIG_DB_ENCRYPTION_AVAILABLE = 'osetup.config.encryption.available' CONFIG_APPLICATION_MODE_AVAILABLE = \ 'osetup.config.applicationMode.available' diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py index 92f0774..9dcd7a3 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py @@ -80,6 +80,7 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, + name=plugin.Stages.CONFIG_WEBSOCKET_PROXY_CUSTOMIZATION, condition=lambda self: self._enabled, before=( osetupcons.Stages.DIALOG_TITLES_E_SYSTEM, @@ -110,20 +111,34 @@ osetupcons.ConfigEnv.WEBSOCKET_PROXY_CONFIG ] - if self._enabled: - self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ - { - 'name': 'ovirt-websocket-proxy', - 'directory': 'base' - }, - ]) - self.environment[ - osetupcons.NetEnv.FIREWALLD_SUBST - ].update({ - '@WEBSOCKET_PROXY_PORT@': self.environment[ - osetupcons.ConfigEnv.WEBSOCKET_PROXY_PORT - ], - }) + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, + condition=lambda self: self.environment[ + osetupcons.ConfigEnv.WEBSOCKET_PROXY_CONFIG + ], + before=( + osetupcons.Stages.DIALOG_TITLES_E_SYSTEM, + ), + after=( + osetupcons.Stages.DB_CONNECTION_STATUS, + osetupcons.Stages.DIALOG_TITLES_S_SYSTEM, + plugin.Stages.CONFIG_WEBSOCKET_PROXY_CUSTOMIZATION, + ), + ) + def _customization_firewall(self): + self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ + { + 'name': 'ovirt-websocket-proxy', + 'directory': 'base' + }, + ]) + self.environment[ + osetupcons.NetEnv.FIREWALLD_SUBST + ].update({ + '@WEBSOCKET_PROXY_PORT@': self.environment[ + osetupcons.ConfigEnv.WEBSOCKET_PROXY_PORT + ], + }) @plugin.event( stage=plugin.Stages.STAGE_MISC, diff --git a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py index e6113c3..803adc0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py @@ -401,6 +401,7 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, + name=plugin.Stages.DB_HOST_LOCATION_CUSTOMIZATION, before=( osetupcons.Stages.DIALOG_TITLES_E_DATABASE, osetupcons.Stages.DB_CONNECTION_CUSTOMIZATION, @@ -485,6 +486,21 @@ osetupcons.DBEnv.SECURED_HOST_VALIDATION ] = osetupcons.Defaults.DEFAULT_DB_SECURED_HOST_VALIDATION + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, + before=( + osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + osetupcons.Stages.DB_CONNECTION_CUSTOMIZATION, + ), + after=( + osetupcons.Stages.DIALOG_TITLES_S_DATABASE, + osetupcons.Stages.DB_HOST_LOCATION_CUSTOMIZATION, + ), + condition=lambda self: ( + self.environment[osetupcons.DBEnv.HOST] == 'localhost' + ) + ) + def _customization_firewall(self): self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-postgres', -- To view, visit http://gerrit.ovirt.org/20737 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3c1a634b2e8539ebd604205b5487290c8d8a1a9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
