Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: setup: database: align manual instructions with 
defaults
......................................................................

packaging: setup: database: align manual instructions with defaults

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1067548
Change-Id: I3bc5329aff8898f406eb02f3544e165b115ea9b4
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py
1 file changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/13/25513/1

diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py
 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py
index 19a44c0..ec69ccb 100644
--- 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py
+++ 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py
@@ -136,18 +136,21 @@
                     "ATTENTION\n"
                     "\n"
                     "Manual action required.\n"
-                    "Please create database for ovirt-engine-reports use. "
+                    "Please create database for ovirt-engine use. "
                     "Use the following commands as an example:\n"
                     "\n"
-                    "create role engine_reports with login encrypted password "
-                    "'engine_reports';"
-                    "create database engine_reports owner engine_reports "
-                    "template template0\n"
-                    "encoding 'UTF8' lc_collate 'en_US.UTF-8'\n"
-                    "lc_ctype 'en_US.UTF-8';\n"
+                    "create role {user} with login encrypted password '{user}'"
+                    ";\n"
+                    "create {database} engine owner {user}\n"
+                    " template template0\n"
+                    " encoding 'UTF8' lc_collate 'en_US.UTF-8'\n"
+                    " lc_ctype 'en_US.UTF-8';\n"
                     "\n"
                     "Make sure that database can be accessed remotely.\n"
                     "\n"
+                ).format(
+                    user=oreportscons.Defaults.DEFAULT_DB_USER,
+                    database=oreportscons.Defaults.DEFAULT_DB_DATABASE,
                 ),
             )
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bc5329aff8898f406eb02f3544e165b115ea9b4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to