Simone Tiraboschi has uploaded a new change for review.

Change subject: packaging: setup: honouring engine DB parameters from answer 
file
......................................................................

packaging: setup: honouring engine DB parameters from answer file

Honouring engine DB parameters if present in the answer file.

Change-Id: I9a7f79f3da05d89b34fa2cc4f74ed628fb44e3b4
Bug-Url: https://bugzilla.redhat.com/1133621
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/engine_common/postgres.py
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/32036/1

diff --git a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py 
b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
index 6723520..df248d3 100644
--- a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
+++ b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
@@ -484,8 +484,12 @@
 
     def applyEnvironment(self):
         for k in ('user', 'database', 'port', 'secured', 'hostValidation'):
-            self.environment[self._dbenvkeys[k]] = self._defaults[k]
-        self.environment[self._dbenvkeys['password']] = self.generatePassword()
+            if self.environment[self._dbenvkeys[k]] is None:
+                self.environment[self._dbenvkeys[k]] = self._defaults[k]
+        if self.environment[self._dbenvkeys['password']] is None:
+            self.environment[
+                self._dbenvkeys['password']
+            ] = self.generatePassword()
 
     def provision(self):
         if not self.supported():


-- 
To view, visit http://gerrit.ovirt.org/32036
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a7f79f3da05d89b34fa2cc4f74ed628fb44e3b4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to