Change in ovirt-engine[master]: pki: upgrade: do not overwrite apache certificate and key
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: pki: upgrade: do not overwrite apache certificate and key
......................................................................
pki: upgrade: do not overwrite apache certificate and key
Fix missing existence condition before duplicate the apache certificate
and key.
This will overwrite 3rd party certificate (if installed) at upgrade from
3.2 to more recent 3.2.
Change-Id: I638e9193fdda7ca9a88313ba1890e9c1a76179af
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=969755
---
M packaging/fedora/setup/engine-upgrade.py
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15265
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I638e9193fdda7ca9a88313ba1890e9c1a76179af
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: findbugs: toString return null
by shavivi@redhat.com
Shahar Havivi has submitted this change and it was merged.
Change subject: findbugs: toString return null
......................................................................
findbugs: toString return null
its a bad practice and may cause to runtime exception when returning
null in toString()
findbugs reason
NP: toString method may return null (NP_TOSTRING_COULD_RETURN_NULL)
Change-Id: Ib7385775b938054a5fd713c458706271b20573ad
Signed-off-by: Shahar Havivi <shavivi(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Uri.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/UriAuthority.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriTest.java
4 files changed, 8 insertions(+), 10 deletions(-)
Approvals:
Shahar Havivi: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15154
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7385775b938054a5fd713c458706271b20573ad
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: packaging: setup: support lexical parsing of configuration
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: setup: support lexical parsing of configuration
......................................................................
packaging: setup: support lexical parsing of configuration
the configuration file format is shell like format, it should be parsed
by shell, python and java.
current implementation does not parse the value using lexical method, so
escape of characters is impossible, and there may be other side effects
like comments that should remain within quotes.
new implementation uses primitive but sufficient parsing of literals.
sync implementation between java and python and sync implementation of
service parser to match this of setup.
Change-Id: I945c8ddbe5de512ab330153c27802bb71964b76f
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/LocalConfigTest.java
A backend/manager/modules/utils/src/test/resources/localconfig.conf
A backend/manager/modules/utils/src/test/resources/localconfig.conf.ref
M packaging/fedora/setup/common_utils.py
M packaging/fedora/setup/engine-upgrade.py
M packaging/services/ovirt-engine-logging.properties.in
M packaging/services/ovirt-engine-notifier.py
M packaging/services/ovirt-engine.py
M packaging/services/ovirt-engine.xml.in
M packaging/services/ovirt-websocket-proxy.py
M packaging/services/service.py
M packaging/setup/ovirt_engine_setup/util.py
M packaging/setup/plugins/ovirt-engine-setup/config/ca.py
M packaging/setup/plugins/ovirt-engine-setup/config/database.py
15 files changed, 417 insertions(+), 260 deletions(-)
Approvals:
Alon Bar-Lev: Verified
Ofer Schreiber: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15142
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I945c8ddbe5de512ab330153c27802bb71964b76f
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: packaging: setup: remove obsolete and dead code
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: setup: remove obsolete and dead code
......................................................................
packaging: setup: remove obsolete and dead code
Change-Id: I9e336e7701d9ef70e5aa41455197ec499eaf8f36
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/config/ca.py
1 file changed, 0 insertions(+), 58 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15179
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e336e7701d9ef70e5aa41455197ec499eaf8f36
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: packaging: setup: do not fail pki backup if files are missin...
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: setup: do not fail pki backup if files are missing
......................................................................
packaging: setup: do not fail pki backup if files are missing
Change-Id: Ib6a5673a64ac5d8d06dec31e46b71cf33f951bbe
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M packaging/setup/plugins/ovirt-engine-remove/config/ca.py
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15181
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6a5673a64ac5d8d06dec31e46b71cf33f951bbe
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(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, 9 months
Change in ovirt-engine[master]: packaging: engine-service: support outputing log to console
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: engine-service: support outputing log to console
......................................................................
packaging: engine-service: support outputing log to console
This ease developer mode, as developer expect to see feedback from the
service.
Change-Id: I554072d771bb380ab8a5b1df748fced53961cf79
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M packaging/conf/engine.conf.defaults.in
M packaging/services/ovirt-engine-notifier.systemd.in
M packaging/services/ovirt-engine-notifier.sysv.in
M packaging/services/ovirt-engine.systemd.in
M packaging/services/ovirt-engine.sysv.in
M packaging/services/ovirt-engine.xml.in
M packaging/services/service.py
M packaging/setup/plugins/ovirt-engine-setup/config/jboss.py
8 files changed, 58 insertions(+), 10 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15169
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I554072d771bb380ab8a5b1df748fced53961cf79
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Martin Beták <mbetak(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: packaging: novnc: fix spelling in comments
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: novnc: fix spelling in comments
......................................................................
packaging: novnc: fix spelling in comments
Change-Id: Ia64b23d491fcd4f406c1a57b4ba812b1760537c1
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M packaging/services/ovirt-websocket-proxy.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15260
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia64b23d491fcd4f406c1a57b4ba812b1760537c1
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: webadmin: avoid multiple failovers caused by import subtabs ...
by derez@redhat.com
Daniel Erez has submitted this change and it was merged.
Change subject: webadmin: avoid multiple failovers caused by import subtabs auto-refresh
......................................................................
webadmin: avoid multiple failovers caused by import subtabs auto-refresh
The SubTabStorageTemplateBackupView/SubTabStorageVmBackupView subtabs
executes an engine query to display the vms/templates that exist on the
selected export domain - this engine query executes an spm command
(GetVmsInfoVDSCommand) which will attempt to perform failover in case of
failure.
The fact that the query is being executed every 5 seconds, causes to the
requests to "pile up" and possibly perform multiple failovers, Therefore
the automatic refresh to the tab has been replaced with manual refresh button.
Change-Id: I2668a60b5b33b2ca8d82b9d08c477ba7c1a3a723
Signed-off-by: Liron Aravot <laravot(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
3 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Daniel Erez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15194
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2668a60b5b33b2ca8d82b9d08c477ba7c1a3a723
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <laravot(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com>
11 years, 9 months
Change in ovirt-engine[master]: webadmin: hide refresh interval tool-tip on sub-tabs
by derez@redhat.com
Daniel Erez has submitted this change and it was merged.
Change subject: webadmin: hide refresh interval tool-tip on sub-tabs
......................................................................
webadmin: hide refresh interval tool-tip on sub-tabs
In continuation of commit 7f1591bd56df7cbee99297a72da491a4053626ba,
the "Refresh Interval: {0} sec" tool-tip should be hidden
when the refresh time is diabled.
Change-Id: I6c92b0c7f33738e50ffe9f858b37fe1cca506bbb
Signed-off-by: Daniel Erez <derez(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Daniel Erez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15202
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c92b0c7f33738e50ffe9f858b37fe1cca506bbb
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com>
11 years, 9 months
Change in ovirt-engine-sdk-java[master]: sdk: move to httpclient 4.1.3
by mpastern@redhat.com
Michael Pasternak has submitted this change and it was merged.
Change subject: sdk: move to httpclient 4.1.3
......................................................................
sdk: move to httpclient 4.1.3
Change-Id: I6ee585baf06abb99d11377f25ce57f99398096f4
Signed-off-by: Michael pasternak <mpastern(a)redhat.com>
---
M ovirt-engine-sdk-java/pom.xml
M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java
2 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Michael Pasternak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/15262
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ee585baf06abb99d11377f25ce57f99398096f4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
11 years, 9 months