Change in ovirt-engine[master]: packaging: setup: support older psycopg2
by oschreib＠redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: setup: support older psycopg2
......................................................................
packaging: setup: support older psycopg2
rhel and centos have version 2.0.14 with autocommit unsupported.
also allow autocommit in a middle of transaction for specific statement.
Change-Id: Icf94f83d3ebf5d121ef7bff3552bccfa09a99ec1
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M packaging/setup/ovirt_engine_setup/database.py
1 file changed, 29 insertions(+), 2 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15358
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf94f83d3ebf5d121ef7bff3552bccfa09a99ec1
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[engine_3.2]: pki: remove database config upgrade
by oschreib＠redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: pki: remove database config upgrade
......................................................................
pki: remove database config upgrade
BACKGROUND
There is a bug in engine-config that existed since beginning of time, it
does not take the CABaseDirectory into account.
However, both the setup and the upgrade set full path for all pki
artifacts, this is why this bug has been never discovered.
DESCRIPTION
The database upgrade script puts two values per default, these are
relative:
select
fn_db_update_config_value('keystoreUrl','keys/engine.p12','general');
select
fn_db_update_config_value('TruststoreUrl','.truststore','general');
When system is upgraded from 3.1, after database upgrade the
engine-upgrade script will convert keys to PKCS#12 format, and overwrite
database settings.
However, if you upgrade from 3.2 to 3.2, then the engine-upgrade script
does not overwrite the setting, leaving relative paths.
WORKAROUND
Modify keystoreUrl and truststoreUrl within database to absolute paths.
Change-Id: Iec8bb367033b5ec03b5b97bd183fc5683523ccd9
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=968906
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15184
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec8bb367033b5ec03b5b97bd183fc5683523ccd9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: engine: Fix unit tests that were broken by multiple gateways
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: engine: Fix unit tests that were broken by multiple gateways
......................................................................
engine: Fix unit tests that were broken by multiple gateways
Multiple gateways feature broke two unit test.
Commit 663243e46549d3796fd50fa362520e0e20cf45b5 fixed the broken tests.
This patch adds some improvements to the fixes were done.
1. In SetupNetworkHelper gateway validation now checks the
ConfigValues.MultipleGatewaysSupported- a mock was added to fix the test.
2. Gateway validation was removed from NetworkInterfaceValidator-
fix the test to emphasisthere are case we support gateway for non
management network.
Change-Id: I1d453ea1efe736dd16dea9b793d784bee4225af8
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
2 files changed, 29 insertions(+), 7 deletions(-)
Approvals:
Alona Kaplan: Verified
Moti Asayag: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15493
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d453ea1efe736dd16dea9b793d784bee4225af8
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 10 months
Change in ovirt-engine[master]: webadmin: add gateway to edit network from setup networks di...
by alkaplan＠redhat.com
Alona Kaplan has submitted this change and it was merged.
Change subject: webadmin: add gateway to edit network from setup networks dialog
......................................................................
webadmin: add gateway to edit network from setup networks dialog
When editing an IP configuration, we need to enable the gateway field for
all networks, not only ovirtmgmt.
If the user chose static IP, then the gateway field should be added and
be editable. If DHCP was chosen then the gateway field should be visible
and display the gateway configured via DHCP.
Change-Id: Ie87f8fa3827b216483b553a8e36011382930585c
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostBondPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.ui.xml
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostManagementPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
11 files changed, 44 insertions(+), 13 deletions(-)
Approvals:
Alona Kaplan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15168
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie87f8fa3827b216483b553a8e36011382930585c
Gerrit-PatchSet: 9
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 10 months
Change in ovirt-engine[master]: tools: Fixes warning message in engine-manage-domains
by yzaslavs＠redhat.com
Yair Zaslavsky has submitted this change and it was merged.
Change subject: tools: Fixes warning message in engine-manage-domains
......................................................................
tools: Fixes warning message in engine-manage-domains
Fixes warning message in engine-manage-domains during add action without
addPermissions options specified, that specified user doesn't have
permissions to log in to administration portal, so granting permissions
to users can be made running engine-manage-domains command or in web
interface logging in as admin@internal user.
Change-Id: I61b091a645f97d6e1994defe1968af2267737344
Bug-Url: https://bugzilla.redhat.com/928394
Signed-off-by: Martin Perina <mperina(a)redhat.com>
---
M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Yair Zaslavsky: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15408
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61b091a645f97d6e1994defe1968af2267737344
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: fontend: Correct host list on New Storage Domain creation
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: fontend: Correct host list on New Storage Domain creation
......................................................................
fontend: Correct host list on New Storage Domain creation
Only show hosts from cluster with virt-service enabled.
Previously implemented by various search and getAllVds queries, depending on DC
type and its selection. Now unified into a single command/stored procedure.
Change-Id: Ifd2b1e7882c8527a80c8f340c4b0c363ba0b0f32
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=882928
Signed-off-by: Martin Betak <mbetak(a)redhat.com>
---
M backend/manager/dbscripts/vds_sp.sql
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostsForStorageOperationQuery.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetHostsForStorageOperationQueryTest.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetHostsForStorageOperationParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsGroupDAOTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
15 files changed, 322 insertions(+), 83 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15397
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd2b1e7882c8527a80c8f340c4b0c363ba0b0f32
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Beták <mbetak(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Martin Beták <mbetak(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: gluster: Added query for gluster cluster service
by kmayilsa＠redhat.com
Kanagaraj M has submitted this change and it was merged.
Change subject: gluster: Added query for gluster cluster service
......................................................................
gluster: Added query for gluster cluster service
Added the query GetGlusterClusterServiceByClusterIdAndServiceType for
getting gluster cluster service based on cluster id and service type.
Change-Id: I123e39fde8317a9227a1bd008c5afbc5dcb7691d
Signed-off-by: Shubhendu Tripathi <shtripat(a)redhat.com>
---
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterClusterServiceByClusterIdQuery.java
1 file changed, 29 insertions(+), 0 deletions(-)
Approvals:
Kanagaraj M: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15241
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I123e39fde8317a9227a1bd008c5afbc5dcb7691d
Gerrit-PatchSet: 14
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shubhendu Tripathi <shtripat(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: Shubhendu Tripathi <shtripat(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 10 months
Change in ovirt-engine[master]: gluster: Added queries for service list
by kmayilsa＠redhat.com
Kanagaraj M has submitted this change and it was merged.
Change subject: gluster: Added queries for service list
......................................................................
gluster: Added queries for service list
Added two queries GetGlusterServerServicesByClusterId and
GetGlusterServerServicesByServerId for getting the list of services for a given
cluster id and server id respectively.
Change-Id: I8e027a49a5a5a49ff37ef78433a96b81add3f8d4
Signed-off-by: Shubhendu Tripathi <shtripat(a)redhat.com>
---
M backend/manager/dbscripts/create_views.sql
M backend/manager/dbscripts/gluster_services_sp.sql
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByClusterIdQuery.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByServerIdQuery.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterServiceQueryParameters.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDao.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
10 files changed, 170 insertions(+), 2 deletions(-)
Approvals:
Kanagaraj M: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15122
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e027a49a5a5a49ff37ef78433a96b81add3f8d4
Gerrit-PatchSet: 26
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shubhendu Tripathi <shtripat(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: Shubhendu Tripathi <shtripat(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 10 months
Change in ovirt-engine[master]: engine: updating GlusterService entities and enum
by kmayilsa＠redhat.com
Kanagaraj M has submitted this change and it was merged.
Change subject: engine: updating GlusterService entities and enum
......................................................................
engine: updating GlusterService entities and enum
- Added GlusterClusterService to Common.gwt.xml to make it available for
GWT
- overriden getQueryableId() for GlusterServerService
- updated the GlusterStatusEnum
* Removed the FAILED status as vdsm won't return this.
* Changed NOT_INSTALLED to NOT_AVAILABLE to be inline with vdsm output
* Added explantion for the enum constants
Change-Id: I671d6f162e9548bcd804572945d5e87e87eff5f6
Signed-off-by: Kanagaraj M <kmayilsa(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterClusterService.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
5 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Kanagaraj M: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15360
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I671d6f162e9548bcd804572945d5e87e87eff5f6
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: Shubhendu Tripathi <shtripat(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 10 months
Change in ovirt-engine[master]: restapi: RSDL Remove Double VmPools URL
by mpastern＠redhat.com
Michael Pasternak has submitted this change and it was merged.
Change subject: restapi: RSDL Remove Double VmPools URL
......................................................................
restapi: RSDL Remove Double VmPools URL
Change-Id: I8abdb5894d36952034a66536e25e7b1b05c9b237
Signed-off-by: Ori Liel <oliel(a)redhat.com>
---
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmApplicationsResource.java
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Michael Pasternak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15519
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8abdb5894d36952034a66536e25e7b1b05c9b237
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
11 years, 10 months