Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: changed override-firewall in firewall-manager ......................................................................
packaging: changed override-firewall in firewall-manager In engine-setup, changed the option override-firewall that the user may expect to be boolean into firewall-manager that accept "None", "Firewalld" or "IPtables" as values. Updated the output messages explaining the meaning of None as firewall manager. Change-Id: Ib5d92079a7caa301de248e90740e77fa5577b068 Bug-Url: https://bugzilla.redhat.com/901987 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M packaging/fedora/setup/engine-setup.py M packaging/fedora/setup/output_messages.py 2 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/11956/1 diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index ff05903..8f616fd 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -218,7 +218,7 @@ """ conf_params = { "IPTABLES" : [ - { "CMD_OPTION" :"override-firewall", + { "CMD_OPTION" : "firewall-manager", "USAGE" :output_messages.INFO_CONF_PARAMS_IPTABLES_USAGE, "PROMPT" :output_messages.INFO_CONF_PARAMS_IPTABLES_PROMPT, "OPTION_LIST" :getFirewalls(), @@ -226,7 +226,7 @@ "DEFAULT_VALUE" :"", "MASK_INPUT" : False, "LOOSE_VALIDATION": False, - "CONF_NAME" : "OVERRIDE_FIREWALL", + "CONF_NAME" : "FIREWALL_MANAGER", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False} ] @@ -947,9 +947,11 @@ _createFirewalldConfig() # Configure chosen firewall - if utils.compareStrIgnoreCase(controller.CONF["OVERRIDE_FIREWALL"], "firewalld"): + if utils.compareStrIgnoreCase(controller.CONF["FIREWALL_MANAGER"], + "firewalld"): _configureFirewalld() - elif utils.compareStrIgnoreCase(controller.CONF["OVERRIDE_FIREWALL"], "iptables"): + elif utils.compareStrIgnoreCase(controller.CONF["FIREWALL_MANAGER"], + "iptables"): _configureIptables() else: # Inform user how he can configure firewall diff --git a/packaging/fedora/setup/output_messages.py b/packaging/fedora/setup/output_messages.py index 7d3a6fe..e5a5ccd 100644 --- a/packaging/fedora/setup/output_messages.py +++ b/packaging/fedora/setup/output_messages.py @@ -99,11 +99,15 @@ INFO_CA_SSH_FINGERPRINT="SSH Public key fingerprint: %s" #conf params -INFO_CONF_PARAMS_IPTABLES_USAGE="Should the installer configure the local firewall, overriding the current configuration" +INFO_CONF_PARAMS_IPTABLES_USAGE="Which firewall manager should be used by the \ +installer for configuring the local firewall. Select None for configuring the \ +firewall manually." INFO_CONF_PARAMS_IPTABLES_PROMPT="Firewall ports need to be opened.\n\ -The installer can configure firewall automatically overriding the current configuration. The old configuration will be backed up.\n\ -Alternately you can configure the firewall later using an example file. \n\ -Which firewall do you wish to configure?" +The installer can configure firewall automatically overriding the current \ +configuration. The old configuration will be backed up.\n\ +Alternately you can configure the firewall later using an example file \ +selecting None.\n\ +Which firewall manager do you wish to use?" INFO_CONF_PARAMS_OVERRIDE_HTTPD_CONF_USAGE="Should the installer configure the ports, overriding the current httpd configuration" -- To view, visit http://gerrit.ovirt.org/11956 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5d92079a7caa301de248e90740e77fa5577b068 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
