Hello Alex Lourie,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/22524
to review the following change.
Change subject: packaging: setup: correctly configure Default.properties
......................................................................
packaging: setup: correctly configure Default.properties
Change-Id: If03aca910ecb1ebe7746d2cf378dc1b16f62c49d
Bug-Url: https://bugzilla.redhat.com/1026947
Signed-off-by: Alex Lourie <[email protected]>
---
M packaging/ovirt-engine-dwh-setup.py
1 file changed, 6 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/24/22524/1
diff --git a/packaging/ovirt-engine-dwh-setup.py
b/packaging/ovirt-engine-dwh-setup.py
index 0df0ec3..e595883 100755
--- a/packaging/ovirt-engine-dwh-setup.py
+++ b/packaging/ovirt-engine-dwh-setup.py
@@ -223,11 +223,7 @@
return userInput
-def getDbCredentials(
- hostdefault='',
- portdefault='',
- userdefault='',
-):
+def getDbCredentials(userdefault=''):
"""
get db params from user
"""
@@ -241,16 +237,6 @@
'owner <role>;\n'
)
- dbhost = utils.askQuestion(
- question='Enter the host name for the DB server',
- default=hostdefault,
- )
-
- dbport = utils.askQuestion(
- question='Enter the port of the remote DB server',
- default=portdefault or '5432',
- )
-
dbuser = utils.askQuestion(
question='Provide a remote DB user',
default=userdefault,
@@ -260,7 +246,7 @@
prompt='Please choose a password for the db user: '
)
- return (dbhost, dbport, dbuser, userInput)
+ return (dbuser, userInput)
def getDbDictFromOptions():
db_dict = {
@@ -308,7 +294,7 @@
file_handler = utils.TextConfigFileHandler(FILE_DB_CONN)
file_handler.open()
file_handler.editParam("ovirtEngineHistoryDbPassword", db_dict["password"])
- file_handler.editParam("ovirtEngineHistoryDbUser", DB_USER)
+ file_handler.editParam("ovirtEngineHistoryDbUser", db_dict["username"])
file_handler.editParam("ovirtEngineDbPassword", db_dict["engine_pass"])
file_handler.editParam("ovirtEngineDbUser", db_dict["engine_user"])
file_handler.editParam("ovirtEngineDbJdbcConnection",
@@ -506,11 +492,11 @@
print 'Remote installation is selected.\n'
if options['REMOTE_DB_HOST'] is None:
(
- db_dict['host'],
- db_dict['port'],
db_dict['username'],
db_dict['password'],
- ) = getDbCredentials()
+ ) = getDbCredentials(
+ userdefault=db_dict['username'],
+ )
else:
db_dict['host'] = options['REMOTE_DB_HOST']
db_dict['port'] = options['REMOTE_DB_PORT']
--
To view, visit http://gerrit.ovirt.org/22524
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If03aca910ecb1ebe7746d2cf378dc1b16f62c49d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Yaniv Dary <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
