Tomas Jelinek has uploaded a new change for review.
Change subject: core: Added SpiceProxy property to vdc_options
......................................................................
core: Added SpiceProxy property to vdc_options
The value of SpiceProxy is in form of [protocol://]<host>[:port]
and will be used in FE to fill into the spice client
Change-Id: I0692bfc29765bee4839b35b658ee388b95728d2f
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/12091/1
diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
index ec3b31e..9c9efb8 100644
--- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -147,6 +147,10 @@
select fn_db_add_config_value('TunnelMigrationEnabled','false','3.1');
select fn_db_add_config_value('TunnelMigrationEnabled','false','3.2');
select fn_db_add_config_value('TunnelMigrationEnabled','true','3.3');
+
+-- by default use no proxy
+select fn_db_add_config_value('SpiceProxy','','general');
+
--Handling Install virtualization software on Add Host
select fn_db_add_config_value('InstallVds','true','general');
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
index ae5c007..c6f6088 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
@@ -1374,6 +1374,11 @@
@DefaultValueAttribute("ar,da,de,de-ch,en-gb,en-us,es,et,fi,fo,fr,fr-be,fr-ca,fr-ch,hr,hu,is,it,ja,lt,lv,mk,nl,nl-be,no,pl,pt,pt-br,ru,sl,sv,th,tr")
VncKeyboardLayoutValidValues(419),
+ @Reloadable
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ SpiceProxy(419),
+
Invalid(65535);
private int intValue;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
index f43a828..524ebf5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
@@ -24,6 +24,7 @@
SpiceSecureChannels(ConfigAuthType.User),
SpiceReleaseCursorKeys(ConfigAuthType.User),
SpiceToggleFullScreenKeys(ConfigAuthType.User),
+ SpiceProxy(ConfigAuthType.User),
HighUtilizationForEvenlyDistribute(ConfigAuthType.User),
SpiceUsbAutoShare(ConfigAuthType.User),
ImportDefaultPath,
--
To view, visit http://gerrit.ovirt.org/12091
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0692bfc29765bee4839b35b658ee388b95728d2f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
