Yaniv Dary has uploaded a new change for review.
Change subject: reports: changed admin user name to non-branded
......................................................................
reports: changed admin user name to non-branded
Change-Id: I513e5d80a933316562828926cbda791b46fe1b0b
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
M packaging/ovirt-reports/index.xml
R packaging/ovirt-reports/users/admin.xml
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
5 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/93/24393/1
diff --git
a/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
b/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
index 7b7e422..7795601 100644
--- a/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
+++ b/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
@@ -9,7 +9,7 @@
- <c:if test="${isProVersion}">
- <li><span class="emphasis">demo/demo</span> <spring:message
code='LOGIN_TO_VIEW_DEMO'/></li>
- </c:if>
-+ <li><span class="emphasis">ovirt-admin</span> <spring:message
code='LOGIN_ADMIN_USER'/></li>
++ <li><span class="emphasis">admin</span> <spring:message
code='LOGIN_ADMIN_USER'/></li>
</ul>
<p class="message"><spring:message code='CONTACT_ADMIN'/>.</p>
</t:putAttribute>
diff --git a/packaging/ovirt-reports/index.xml
b/packaging/ovirt-reports/index.xml
index 0a46e61..e4bf3f0 100644
--- a/packaging/ovirt-reports/index.xml
+++ b/packaging/ovirt-reports/index.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<export><property name="pathProcessorId" value="file"/><property
name="jsVersion" value="4.2.1 CE"/><module
id="authority"><user>ovirt-admin</user><role>ROLE_USER</role><role>ROLE_ADMINISTRATOR</role></module><module
id="repositoryResources"><folder>/</folder></module></export>
+<export><property name="pathProcessorId" value="file"/><property
name="jsVersion" value="4.2.1 CE"/><module
id="authority"><user>admin</user><role>ROLE_USER</role><role>ROLE_ADMINISTRATOR</role></module><module
id="repositoryResources"><folder>/</folder></module></export>
diff --git a/packaging/ovirt-reports/users/ovirt-002dadmin.xml
b/packaging/ovirt-reports/users/admin.xml
similarity index 65%
rename from packaging/ovirt-reports/users/ovirt-002dadmin.xml
rename to packaging/ovirt-reports/users/admin.xml
index 5d66f23..19d408c 100644
--- a/packaging/ovirt-reports/users/ovirt-002dadmin.xml
+++ b/packaging/ovirt-reports/users/admin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<user>
- <username>ovirt-admin</username>
- <fullName>ovirt-admin</fullName>
- <password>oVirtadmin2009!</password>
+ <username>admin</username>
+ <fullName>admin</fullName>
+ <password>admin1!</password>
<email></email>
<externallyDefined>false</externallyDefined>
<enabled>true</enabled>
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py
index 7968bdf..0869626 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py
@@ -74,13 +74,13 @@
while not valid:
password = self.dialog.queryString(
name='OVESETUP_REPORTS_CONFIG_JASPER_ADMIN_PASSWORD',
- note=_('Reports admin password (ovirt-admin): '),
+ note=_('Reports admin user password: '),
prompt=True,
hidden=True,
)
password2 = self.dialog.queryString(
name='OVESETUP_REPOTS_CONFIG_JASPER_ADMIN_PASSWORD',
- note=_('Confirm Reports admin password (ovirt-admin): '),
+ note=_('Confirm Reports admin user password: '),
prompt=True,
hidden=True,
)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
index f5f7a83..5033f85 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
@@ -365,7 +365,7 @@
os.path.join(
reportsImport,
'users',
- 'ovirt-002dadmin.xml',
+ 'admin.xml',
)
) as xml:
xml.setNodesContent(
--
To view, visit http://gerrit.ovirt.org/24393
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I513e5d80a933316562828926cbda791b46fe1b0b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
