Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Always enable postgres and websocket ......................................................................
packaging: setup: Always enable postgres and websocket Always enable postgresql and websocket-proxy services to start on boot if they were configured so, and not only on action setup. Bug-Url: https://bugzilla.redhat.com/1024707 Change-Id: I341eb3fbd64b904da502b293de52770e951417d2 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py M packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py 2 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/20736/1 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..3447c2c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py @@ -243,7 +243,9 @@ condition=lambda self: ( self._needStart or ( - self._enabled and + self.environment[ + osetupcons.ConfigEnv.WEBSOCKET_PROXY_CONFIG + ] and not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ] diff --git a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py index e6113c3..b46ed67 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py @@ -621,13 +621,6 @@ state=state, ) - self.services.startup( - name=self.environment[ - osetupcons.ProvisioningEnv.POSTGRES_SERVICE - ], - state=True, - ) - self._waitDatabase() @plugin.event( @@ -656,5 +649,19 @@ ) ) + @plugin.event( + stage=plugin.Stages.STAGE_CLOSEUP, + condition=lambda self: ( + self.environment[osetupcons.DBEnv.HOST] == 'localhost' + ) + ) + def _closeup_services(self): + self.services.startup( + name=self.environment[ + osetupcons.ProvisioningEnv.POSTGRES_SERVICE + ], + state=True, + ) + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/20736 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I341eb3fbd64b904da502b293de52770e951417d2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
