Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: allow reports on separate host ......................................................................
packaging: setup: allow reports on separate host Change-Id: I426f040446e6288f481f9a256ddbfa35ce729e0b Bug-Url: https://bugzilla.redhat.com/1080998 Signed-off-by: Yedidyah Bar David <[email protected]> --- M ovirt-engine-reports.spec.in M packaging/setup/ovirt_engine_setup/reportsconstants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py 5 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/79/28479/1 diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index 702be62..c9d1828 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -60,8 +60,10 @@ Requires: jpackage-utils Requires: logrotate Requires: m2crypto -Requires: %{engine_name} >= 3.5.0 Requires: patch +Requires: postgresql-jdbc +Requires: python-cheetah +Requires: mod_ssl # bug#862355 Requires: liberation-mono-fonts @@ -78,8 +80,10 @@ Group: Virtualization/Management Requires: cracklib-python Requires: libxml2-python -Requires: %{engine_name}-dwh-setup Requires: %{engine_name}-setup-plugin-ovirt-engine-common +Requires: %{engine_name}-setup-plugin-postgresql-server +Requires: %{engine_name}-setup-plugin-jboss +Requires: %{engine_name}-dwh-setup-plugin-common Requires: python %description setup diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index 818f3e1..22cf1b7 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -344,6 +344,7 @@ DATABASE = 'OVESETUP_DWH_DB/database' USER = 'OVESETUP_DWH_DB/user' PASSWORD = 'OVESETUP_DWH_DB/password' + CREDS_NEEDED = 'OVESETUP_DWH_DB/credsNeeded' # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py index 59c3222..110627f 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -95,6 +95,8 @@ self.environment[oreportscons.DBEnv.STATEMENT] = None self.environment[oreportscons.DBEnv.NEW_DATABASE] = True + self.environment[oreportscons.DWHDBEnv.CREDS_NEEDED] = True + @plugin.event( stage=plugin.Stages.STAGE_SETUP, ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index e775263..0269020 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -73,7 +73,10 @@ options=( { 'name': 'RedirectServletReportsPage', - 'value': '/ovirt-engine-reports', + 'value': 'https://{fqdn}/ovirt-engine-reports'.format( + fqdn=self.environment[osetupcons.ConfigEnv.FQDN] + # TODO - what about protocol (http/https) and port? + ), }, ), ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py index 94dd9f0..9fb17a6 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -152,14 +152,14 @@ stage=plugin.Stages.STAGE_CUSTOMIZATION, priority=plugin.Stages.PRIORITY_LAST, condition=lambda self: self.environment[ - osetupcons.DBEnv.HOST + oreportscons.DBEnv.HOST ] == 'localhost', ) def _customization_firewall(self): self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-postgres', - 'directory': 'ovirt-engine' + 'directory': 'postgresql-server' }, ]) -- To view, visit http://gerrit.ovirt.org/28479 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I426f040446e6288f481f9a256ddbfa35ce729e0b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
