Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: open correct vdsm port in iptables ......................................................................
host-deploy: open correct vdsm port in iptables Change-Id: I17c26f0c87ef8e49b842909103127cb675247d89 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/20600/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 4607390..69071ec 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 @@ -79,6 +79,7 @@ public static enum DeployStatus {Complete, Incomplete, Failed, Reboot}; private static final int THREAD_JOIN_TIMEOUT = 20 * 1000; // milliseconds private static final String IPTABLES_CUSTOM_RULES_PLACE_HOLDER = "@CUSTOM_RULES@"; + private static final String IPTABLES_VDSM_PORT_PLACE_HOLDER = "@VDSM_PORT@"; private static final String IPTABLES_SSH_PORT_PLACE_HOLDER = "@SSH_PORT@"; private static final String BOOTSTRAP_CUSTOM_ENVIRONMENT_PLACE_HOLDER = "@ENVIRONMENT@"; @@ -213,6 +214,9 @@ ).replace( IPTABLES_SSH_PORT_PLACE_HOLDER, Integer.toString(_vds.getSshPort()) + ).replace( + IPTABLES_VDSM_PORT_PLACE_HOLDER, + Integer.toString(_vds.getPort()) ); return ipTablesConfig; diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index f045258..a4328e6 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -234,7 +234,7 @@ -A INPUT -p icmp -j ACCEPT -A INPUT -i lo -j ACCEPT # vdsm --A INPUT -p tcp --dport 54321 -j ACCEPT +-A INPUT -p tcp --dport @VDSM_PORT@ -j ACCEPT # libvirt tls -A INPUT -p tcp --dport 16514 -j ACCEPT # SSH @@ -659,7 +659,7 @@ -A INPUT -i lo -j ACCEPT # vdsm --A INPUT -p tcp --dport 54321 -j ACCEPT +-A INPUT -p tcp --dport @VDSM_PORT@ -j ACCEPT # SSH -A INPUT -p tcp --dport @SSH_PORT@ -j ACCEPT # snmp -- To view, visit http://gerrit.ovirt.org/20600 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17c26f0c87ef8e49b842909103127cb675247d89 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
