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 Bug-Url: https://bugzilla.redhat.com/1221148 Change-Id: I5a3dbd27d1669df6dff927f21eb38301c43f6b50 Signed-off-by: Yedidyah Bar David <d...@redhat.com> (cherry picked from commit dd9741f7ed39c2bb4438bcedd453d84dd4c8023d) --- M src/plugins/ovirt-hosted-engine-setup/network/firewall_manager.py 1 file changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/48/41048/1 diff --git a/src/plugins/ovirt-hosted-engine-setup/network/firewall_manager.py b/src/plugins/ovirt-hosted-engine-setup/network/firewall_manager.py index 6181136..8f16712 100644 --- a/src/plugins/ovirt-hosted-engine-setup/network/firewall_manager.py +++ b/src/plugins/ovirt-hosted-engine-setup/network/firewall_manager.py @@ -122,9 +122,6 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, name=ohostedcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE, - condition=lambda self: not self.environment[ - ohostedcons.CoreEnv.IS_ADDITIONAL_HOST - ], after=( ohostedcons.Stages.DIALOG_TITLES_S_NETWORK, ), @@ -139,6 +136,24 @@ # It has to be done here and not at init stage because it's assigned # at customization stage by otopi. self.environment[otopicons.NetEnv.FIREWALLD_AVAILABLE] = False + + if ( + self.environment[ + ohostedcons.CoreEnv.IS_ADDITIONAL_HOST + ] and self.environment[ + ohostedcons.NetworkEnv.FIREWALL_MANAGER + ] is not None + ): + self.logger.info( + _( + "Additional host deployment, firewall manager is " + "'{manager}'" + ).format( + manager=self.environment[ + ohostedcons.NetworkEnv.FIREWALL_MANAGER + ], + ) + ) if self.environment[ohostedcons.NetworkEnv.FIREWALL_MANAGER] is None: managers = [] @@ -188,10 +203,6 @@ after=( ohostedcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE, ), - condition=lambda self: not self.environment[ - ohostedcons.CoreEnv.IS_ADDITIONAL_HOST - ], - # must be always enabled to create examples on first host ) def _process_templates(self): for service in self.environment[ -- To view, visit https://gerrit.ovirt.org/41048 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a3dbd27d1669df6dff927f21eb38301c43f6b50 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: ovirt-hosted-engine-setup-1.2 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
