Sandro Bonazzola has uploaded a new change for review. Change subject: tools: engine-setup - fixed installation messages ......................................................................
tools: engine-setup - fixed installation messages Fixed memory requirements for running the engine, 4Gb is the minimum, 16Gb is the recomended ammount of RAM. Display instructions for configuring iptables and firewalld only if they're available on the system. Change-Id: I89964bc30c275a29428abef06d07b7a8911ee211 Bug-Url: https://bugzilla.redhat.com/921079 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/fedora/setup/basedefs.py M packaging/fedora/setup/engine-setup.py 2 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/13198/1 diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index b473f04..9e3e5e5 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -189,8 +189,8 @@ CONST_CA_COUNTRY="US" CONST_CA_ALIAS="engine" CONST_STORAGE_DOMAIN_NAME_SIZE_LIMIT=50 -CONST_MIN_MEMORY_MB=2048 -CONST_WARN_MEMORY_MB=4096 +CONST_MIN_MEMORY_MB=4096 +CONST_WARN_MEMORY_MB=16384 CONST_ORG_NAME_SIZE_LIMIT=64 CONST_VDSM_UID = 36 CONST_KVM_GID = 36 diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index 889807e..f67cd35 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -945,6 +945,7 @@ return firewalls + def _configFirewall(): # Create Sample configuration files _createIptablesConfig() @@ -959,9 +960,24 @@ _configureIptables() else: # Inform user how he can configure firewall - controller.MESSAGES.append(output_messages.INFO_IPTABLES_PORTS % (controller.CONF["HTTP_PORT"], controller.CONF["HTTPS_PORT"])) - controller.MESSAGES.append(output_messages.INFO_IPTABLES_FILE % (basedefs.FILE_IPTABLES_EXAMPLE)) - controller.MESSAGES.append(output_messages.INFO_FIREWALLD_INSTRUCTIONS) + firewalls = getFirewalls() + if 'iptables' in firewalls: + controller.MESSAGES.append( + output_messages.INFO_IPTABLES_PORTS % ( + controller.CONF["HTTP_PORT"], + controller.CONF["HTTPS_PORT"], + ) + ) + controller.MESSAGES.append( + output_messages.INFO_IPTABLES_FILE % ( + basedefs.FILE_IPTABLES_EXAMPLE, + ) + ) + if 'Firewalld' in firewalls: + controller.MESSAGES.append( + output_messages.INFO_FIREWALLD_INSTRUCTIONS + ) + def _createFirewalldConfig(): logging.debug("Creating firewalld configuration") -- To view, visit http://gerrit.ovirt.org/13198 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89964bc30c275a29428abef06d07b7a8911ee211 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
