Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: configure ssh port per port used to actual communications ......................................................................
host-deploy: configure ssh port per port used to actual communications Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1018948 Change-Id: I1b581f81ad3f11b22eb20b72d34a41fae47f18bc 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/09/20309/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 e32108e..f56b2a0 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_SSH_PORT_PLACE_HOLDER = "@SSH_PORT@"; private static final String BOOTSTRAP_CUSTOM_ENVIRONMENT_PLACE_HOLDER = "@ENVIRONMENT@"; private static final Log log = LogFactory.getLog(VdsDeploy.class); @@ -209,6 +210,9 @@ ipTablesConfig = ipTablesConfig.replace( IPTABLES_CUSTOM_RULES_PLACE_HOLDER, serviceIPTablesConfig + ).replace( + IPTABLES_SSH_PORT_PLACE_HOLDER, + Integer.toString(_vds.getSshPort()) ); return ipTablesConfig; diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 5d107dc..44a9375 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -230,7 +230,7 @@ # libvirt tls -A INPUT -p tcp --dport 16514 -j ACCEPT # SSH --A INPUT -p tcp --dport 22 -j ACCEPT +-A INPUT -p tcp --dport @SSH_PORT@ -j ACCEPT # guest consoles -A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT # migration @@ -649,7 +649,7 @@ # vdsm -A INPUT -p tcp --dport 54321 -j ACCEPT # SSH --A INPUT -p tcp --dport 22 -j ACCEPT +-A INPUT -p tcp --dport @SSH_PORT@ -j ACCEPT # snmp -A INPUT -p udp --dport 161 -j ACCEPT -- To view, visit http://gerrit.ovirt.org/20309 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b581f81ad3f11b22eb20b72d34a41fae47f18bc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
