Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: move engine pgpass creation ......................................................................
packaging: setup: move engine pgpass creation Move Engine pgpass creation from base to engine plugin - it's only used by the engine, and fails on cleanup otherwise. Change-Id: I9531f249c0a2f2bbb56d0e63115e8193956849ce Related-To: https://bugzilla.redhat.com/1080997 Related-To: https://bugzilla.redhat.com/1080998 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/__init__.py R packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py 3 files changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/27513/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py b/packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py index fbefbe9..53ea671 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py @@ -23,13 +23,11 @@ from . import connection -from . import pgpass @util.export def createPlugins(context): connection.Plugin(context=context) - pgpass.Plugin(context=context) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/__init__.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/__init__.py new file mode 100644 index 0000000..88b8011 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/__init__.py @@ -0,0 +1,33 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2013 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-host-setup datebase plugin.""" + + +from otopi import util + + +from . import pgpass + + [email protected] +def createPlugins(context): + pgpass.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py similarity index 95% rename from packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py rename to packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py index 6bd9ad8..1e2d8e4 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 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. @@ -51,7 +51,7 @@ ] is not None ) def _validation(self): - # this required for dbvalidations + # this is required for dbvalidations database.OvirtUtils( plugin=self, dbenvkeys=osetupcons.Const.ENGINE_DB_ENV_KEYS, -- To view, visit http://gerrit.ovirt.org/27513 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9531f249c0a2f2bbb56d0e63115e8193956849ce 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
