Vinzenz Feenstra has uploaded a new change for review.

Change subject: Change GuestToolsSetupIsoPrefix to ovirt-guest-tools-
......................................................................

Change GuestToolsSetupIsoPrefix to ovirt-guest-tools-

Change-Id: Iecffeb7e688ca76ec75005f966524da0f1c77bb8
Bug-Url: https://bugzilla.redhat.com/1109841
Signed-off-by: Vinzenz Feenstra <[email protected]>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/28930/1

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 61685a8..c97330c 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
@@ -399,7 +399,7 @@
     SpiceDriverNameInGuest,
     @Reloadable
     @TypeConverterAttribute(String.class)
-    @DefaultValueAttribute("RHEV-toolsSetup_")
+    @DefaultValueAttribute("ovirt-guest-tools-")
     GuestToolsSetupIsoPrefix,
     @Reloadable
     @TypeConverterAttribute(Integer.class)
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index 706283b..83486aa 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -169,7 +169,7 @@
 -- OpenStack related
 select fn_db_add_config_value('KeystoneAuthUrl', '', 'general');
 
-select 
fn_db_add_config_value('GuestToolsSetupIsoPrefix','RHEV-toolsSetup_','general');
+select 
fn_db_add_config_value('GuestToolsSetupIsoPrefix','ovirt-guest-tools-','general');
 select fn_db_add_config_value('HardwareInfoEnabled','false','3.0');
 select fn_db_add_config_value('HardwareInfoEnabled','false','3.1');
 select 
fn_db_add_config_value('HighUtilizationForEvenlyDistribute','75','general');
@@ -931,6 +931,7 @@
 -- disable retries for more predictable HA timing:
 select fn_db_update_default_config_value('vdsConnectionTimeout', '180', '2', 
'general', false);
 select fn_db_update_default_config_value('vdsRetries', '3', '0', 'general', 
false);
+select 
fn_db_update_default_config_value('GuestToolsSetupIsoPrefix','ovirt-guest-tools-','general',
 false);
 
 
------------------------------------------------------------------------------------
 --              Cleanup deprecated configuration values section


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

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

Reply via email to