Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: configure firewall on additional host ......................................................................
packaging: setup: configure firewall on additional host Change-Id: I9e88aa44126e2ed062100ea75d71b00bffc8b3dc Signed-off-by: Yedidyah Bar David <[email protected]> --- M src/ovirt_hosted_engine_setup/constants.py M src/plugins/ovirt-hosted-engine-setup/engine/add_host.py 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/13/40913/1 diff --git a/src/ovirt_hosted_engine_setup/constants.py b/src/ovirt_hosted_engine_setup/constants.py index c6195d6..6272a73 100644 --- a/src/ovirt_hosted_engine_setup/constants.py +++ b/src/ovirt_hosted_engine_setup/constants.py @@ -437,6 +437,13 @@ TEMPORARY_CERT_FILE = 'OVEHOSTED_ENGINE/temporaryCertificate' PROMPT_NON_OPERATIONAL = 'OVEHOSTED_ENGINE/promptNonOperational' + @ohostedattrs( + summary=True, + description=_('Engine host-deploy overrides iptables'), + ) + def OVERRIDE_IPTABLES(self): + return 'OVEHOSTED_ENGINE/overrideIptables' + @util.export @util.codegen diff --git a/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py b/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py index ebac166..b6b5d9e 100644 --- a/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py +++ b/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py @@ -515,6 +515,15 @@ raiseOnError=False, ) self._selinux_enabled = rc == 0 + self.environment.setdefault( + ohostedcons.EngineEnv.OVERRIDE_IPTABLES, + ( + self.environment[ + ohostedcons.NetworkEnv.FIREWALL_MANAGER + ] is not None + # Or == 'iptables' ? + ) + ) @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, @@ -685,9 +694,11 @@ ohostedcons.NetworkEnv.SSHD_PORT ], ), - override_iptables=self.environment[ - otopicons.NetEnv.IPTABLES_ENABLE - ], + override_iptables=( + self.environment[ + ohostedcons.EngineEnv.OVERRIDE_IPTABLES + ] + ), ) ) except ovirtsdk.infrastructure.errors.RequestError as e: -- To view, visit https://gerrit.ovirt.org/40913 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e88aa44126e2ed062100ea75d71b00bffc8b3dc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
