Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: add IPTablesConfigSiteCustom vdc_option ......................................................................
host-deploy: add IPTablesConfigSiteCustom vdc_option enables adding site specific rules without overriding entire configuration. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1111513 Change-Id: I713a7886216c0e868fc4bc1e77077bab6548108f Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java 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 M packaging/etc/engine-config/engine-config.properties 4 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/29368/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 7e76ae2..83d2d8d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -216,6 +216,7 @@ if (vdsGroup.supportsGlusterService()) { serviceIPTablesConfig += Config.<String> getValue(ConfigValues.IPTablesConfigForGluster); } + serviceIPTablesConfig += Config.<String> getValue(ConfigValues.IPTablesConfigSiteCustom); ipTablesConfig = ipTablesConfig.replace( IPTABLES_CUSTOM_RULES_PLACE_HOLDER, 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 154d0c2..588e797 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 @@ -1199,6 +1199,11 @@ @DefaultValueAttribute("") IPTablesConfigForGluster, + @Reloadable + @TypeConverterAttribute(String.class) + @DefaultValueAttribute("") + IPTablesConfigSiteCustom, + // Host time drift @Reloadable @TypeConverterAttribute(Boolean.class) diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 6a02692..9ea49e2 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -410,6 +410,7 @@ ', 'general'); +select fn_db_add_config_value('IPTablesConfigSiteCustom','','general'); select fn_db_add_config_value('IsMultilevelAdministrationOn','true','general'); select fn_db_add_config_value('JobCleanupRateInMinutes','10','general'); select fn_db_add_config_value('JobPageSize','100','general'); diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index 3cf663d..d12a26c 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -216,6 +216,7 @@ AdminPassword.description="The password of the internal administrator of the Engine" AdminPassword.type=Password IPTablesConfig.description="iptables configuration" +IPTablesConfigSiteCustom.description="iptables site custom configuration, appended to IPTablesConfig" OvirtIsoPrefix.description="Ovirt ISOs files prefix" OvirtInitialSupportedIsoVersion.description="oVirt node initial Supported ISO Version" VdsLocalDisksLowFreeSpace.description="Amount of free disk space on a Host, under which a warning will be sent to the Administrator" -- To view, visit http://gerrit.ovirt.org/29368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I713a7886216c0e868fc4bc1e77077bab6548108f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
