Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: upgrade firewall configuration ......................................................................
packaging: setup: upgrade firewall configuration Added automatic firewall configuration when upgrading from legacy setup. Change-Id: I019c2a5deecaa8aaac0fdd9b0fc84555ce0e99ef Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/15978/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py index 94f773b..b1c69d7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py +++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py @@ -148,14 +148,23 @@ ], ) def _customization(self): - if self.environment[osetupcons.ConfigEnv.FIREWALL_MANAGER] is None: - managers = [] - if self.services.exists('firewalld'): - if self._isPermanentSupported(): - managers.append('firewalld') - if self.services.exists('iptables'): - managers.append('iptables') + managers = [] + if self.services.exists('firewalld'): + if self._isPermanentSupported(): + managers.append('firewalld') + if self.services.exists('iptables'): + managers.append('iptables') + if self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY]: + for manager in managers: + if ( + self.services.exists(manager) and + self.services.status(manager) + ): + self.environment[ + osetupcons.ConfigEnv.FIREWALL_MANAGER + ] = manager + if self.environment[osetupcons.ConfigEnv.FIREWALL_MANAGER] is None: for manager in managers: response = self.dialog.queryString( name='OVESETUP_CONFIG_FIREWALL_MANAGER', -- To view, visit http://gerrit.ovirt.org/15978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I019c2a5deecaa8aaac0fdd9b0fc84555ce0e99ef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
