Addressed @billy-olsen comments

This commit is contained in:
Jorge Niedbalski 2015-04-13 14:15:49 -03:00
parent d95a1c76ef
commit 2043055e4b
2 changed files with 20 additions and 7 deletions

View File

@ -96,8 +96,24 @@ options:
type: string
default: ignore
description: |
How to respond to cluster partitions.
See http://www.rabbitmq.com/partitions.html for further details.
RabbitMQ offers three ways to deal with network partitions automatically.
Available modes:
ignore - Your network is reliable. All your nodes are in a rack,
connected with a switch, and that switch is also the route to the outside world.
You don't want to run any risk of any of your cluster shutting down if any other part of it fails
(or you have a two node cluster).
pause_minority - Your network is maybe less reliable. You have clustered across 3 AZs in EC2,
and you assume that only one AZ will fail at once.
In that scenario you want the remaining two AZs to continue working and the nodes from the failed AZ
to rejoin automatically and without fuss when the AZ comes back.
autoheal - Your network may not be reliable.
You are more concerned with continuity of service than with data integrity.
You may have a two node cluster.
For more information see http://www.rabbitmq.com/partitions.html.
rbd-size:
type: string
default: 5G

View File

@ -94,11 +94,8 @@ class RabbitMQSSLContext(object):
ssl_port = config('ssl_port')
# If external managed certs then we need all the fields.
if (
ssl_mode in ('on', 'only') and
any((ssl_key, ssl_cert)) and
not all((ssl_key, ssl_cert))
):
if (ssl_mode in ('on', 'only') and any((ssl_key, ssl_cert)) and
not all((ssl_key, ssl_cert))):
log('If ssl_key or ssl_cert are specified both are required.',
level=ERROR)
sys.exit(1)