Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Update postgresql.conf listen_address ......................................................................
packaging: setup: Update postgresql.conf listen_address Allow connecting to the database from remote. Listen on '*' (all local addresses) by default, env overridable. Change-Id: I9e2111271732f395878621b23b9ca3689814a084 Bug-Url: https://bugzilla.redhat.com/1080997 Bug-Url: https://bugzilla.redhat.com/1080998 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/postgres.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py 3 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/27285/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 508dfe6..804d87f 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -497,6 +497,7 @@ DEFAULT_POSTGRES_PROVISIONING_SERVICE = 'postgresql' DEFAULT_POSTGRES_PROVISIONING_MAX_CONN = 150 + DEFAULT_POSTGRES_PROVISIONING_LISTEN_ADDRESS = '*' @util.export @@ -992,6 +993,7 @@ POSTGRES_PG_VERSION = 'OVESETUP_PROVISIONING/postgresPgVersion' POSTGRES_SERVICE = 'OVESETUP_PROVISIONING/postgresService' POSTGRES_MAX_CONN = 'OVESETUP_PROVISIONING/postgresMaxConn' + POSTGRES_LISTEN_ADDRESS = 'OVESETUP_PROVISIONING/postgresListenAddress' @util.export diff --git a/packaging/setup/ovirt_engine_setup/postgres.py b/packaging/setup/ovirt_engine_setup/postgres.py index 7add279..f80452a 100644 --- a/packaging/setup/ovirt_engine_setup/postgres.py +++ b/packaging/setup/ovirt_engine_setup/postgres.py @@ -259,10 +259,11 @@ ), ) - def _updateMaxConnections( + def _updatePostgresConf( self, transaction, maxconn, + listenaddr, ): with open( self.environment[ @@ -275,9 +276,15 @@ for l in content: m = self._RE_KEY_VALUE.match(l) if ( - m is not None and - m.group('key') == 'max_connections' and - int(m.group('value')) >= int(maxconn) + m is not None and ( + ( + m.group('key') == 'max_connections' and + int(m.group('value')) >= int(maxconn) + ) or ( + m.group('key') == 'listen_addresses' and + int(m.group('value')) != listen_addresses + ) + ) ): needUpdate = False break @@ -287,6 +294,7 @@ content=content, params={ 'max_connections': maxconn, + 'listen_addresses': listen_addresses, }, ) @@ -532,11 +540,14 @@ self.logger.info(_('Configuring PostgreSQL')) with transaction.Transaction() as localtransaction: - self._updateMaxConnections( + self._updatePostgresConf( transaction=localtransaction, maxconn=self.environment[ osetupcons.ProvisioningEnv.POSTGRES_MAX_CONN ], + listenaddr=self.environment[ + osetupcons.ProvisioningEnv.POSTGRES_LISTEN_ADDRESS + ], ) self._addPgHbaDatabaseAccess( transaction=localtransaction, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py index 8804c1a..b2cd35e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py @@ -61,6 +61,10 @@ osetupcons.ProvisioningEnv.POSTGRES_MAX_CONN, osetupcons.Defaults.DEFAULT_POSTGRES_PROVISIONING_MAX_CONN ) + self.environment.setdefault( + osetupcons.ProvisioningEnv.POSTGRES_LISTEN_ADDRESS, + osetupcons.Defaults.DEFAULT_POSTGRES_PROVISIONING_LISTEN_ADDRESS + ) # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/27285 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e2111271732f395878621b23b9ca3689814a084 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
