Merge "Adjust standalone example so it works"
diff --git a/.kitchen.yml b/.kitchen.yml
index 2c481f8..ac702d1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -31,7 +31,7 @@
platforms:
- name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config:
- image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+ image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu
suites:
diff --git a/.travis.yml b/.travis.yml
index 1c79205..224bbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,16 @@
- bundle install
env:
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-server
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-ssl-server
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-server
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-ssl-server
- # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-server
- # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-ssl-server
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-server
+# - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-ssl-server
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-server
+# - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-ssl-server
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=rabbitmq-server
+# - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=rabbitmq-ssl-server
+ # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-server
+ # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-ssl-server
+ # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=rabbitmq-server
+ # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=rabbitmq-ssl-server
before_script:
- set -o pipefail
diff --git a/README.rst b/README.rst
index e995784..5cae8aa 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,9 @@
=========================
-RabbitMQ messaging system
+Usage
=========================
-RabbitMQ is a complete and highly reliable enterprise messaging system based on the emerging AMQP standard.
+RabbitMQ is a complete and highly reliable enterprise messaging
+system based on the emerging AMQP standard.
Sample pillars
==============
@@ -10,7 +11,7 @@
Standalone Broker
-----------------
-RabbitMQ as AMQP broker with admin user and vhosts
+RabbitMQ as AMQP broker with admin user and vhosts:
.. code-block:: yaml
@@ -35,7 +36,7 @@
user: 'monitor'
password: 'password'
-RabbitMQ as a Stomp broker
+RabbitMQ as a Stomp broker:
.. code-block:: yaml
@@ -58,7 +59,7 @@
RabbitMQ cluster
----------------
-RabbitMQ as base cluster node
+RabbitMQ as base cluster node:
.. code-block:: yaml
@@ -82,7 +83,7 @@
- name: openstack2
host: 10.10.10.213
-HA Queues definition
+HA Queues definition:
.. code-block:: yaml
@@ -100,11 +101,11 @@
pattern: '^(?!amq\.).*'
definition: '{"ha-mode": "all"}'
-
Enable TLS support
------------------
-To enable support of TLS for rabbitmq-server you need to provide a path to cacert, server cert and private key :
+To enable support of TLS for rabbitmq-server you need to provide
+a path to cacert, server cert and private key:
.. code-block:: yaml
@@ -118,7 +119,8 @@
cert_file: /etc/rabbitmq/ssl/cert.pem
ca_file: /etc/rabbitmq/ssl/ca.pem
-To manage content of these files you can either use the following options:
+To manage content of these files you can either use the following
+options:
.. code-block:: yaml
@@ -149,7 +151,10 @@
Or you can use the `salt.minion.cert` salt state which
-creates all required files according to defined reclass model [1]. In this case you need just to enable ssl and nothing more:
+creates all required files according to defined reclass model.
+See
+https://github.com/Mirantis/reclass-system-salt-model/tree/master/salt/minion/cert/rabbitmq
+for details. In this case you need just to enable ssl and nothing more:
.. code-block:: yaml
@@ -160,9 +165,7 @@
ssl:
enabled: True
---
-
-Defaut port for TLS is **5671**:
+Defaut port for TLS is ``5671``:
.. code-block:: yaml
@@ -172,15 +175,11 @@
ssl:
port: 5671
-
-1. https://github.com/Mirantis/reclass-system-salt-model/tree/master/salt/minion/cert/rabbitmq
-
-
-
Usage
=====
-Check cluster status, example shows running cluster with 3 nodes: ctl-1, ctl-2, ctl-3
+Check cluster status, example shows running cluster with 3 nodes:
+ctl-1, ctl-2, ctl-3
.. code-block:: yaml
@@ -192,7 +191,7 @@
{partitions,[]}]
...done.
-Setup management user.
+Setup management user:
.. code-block:: yaml
@@ -201,8 +200,16 @@
> rabbitmqctl set_permissions -p vhost user ".*" ".*" ".*"
> rabbitmqctl set_user_tags user management
-EPD process is Erlang Port Mapper Daemon. It's a feature of the Erlang runtime that helps Erlang nodes to find each other. It's a pretty tiny thing and doesn't contain much state (other than "what Erlang nodes are running on this system?") so it's not a huge deal for it to still be running.
-Although it's running as user rabbitmq, it was started automatically by the Erlang VM when we started. We've considered adding "epmd -kill" to our shutdown script - but that would break any other Erlang apps running on the system; it's more "global" than RabbitMQ.
+EPD process is Erlang Port Mapper Daemon. It's a feature of the
+Erlang runtime that helps Erlang nodes to find each other. It's a
+pretty tiny thing and doesn't contain much state (other than "what
+Erlang nodes are running on this system?") so it's not a huge deal for
+it to still be running.
+
+Although it's running as user rabbitmq, it was started automatically
+by the Erlang VM when we started. We've considered adding "epmd -kill"
+to our shutdown script - but that would break any other Erlang apps
+running on the system; it's more "global" than RabbitMQ.
Read more
=========
@@ -224,32 +231,25 @@
Documentation and Bugs
======================
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
+* http://salt-formulas.readthedocs.io/
+ Learn how to install and update salt-formulas
- http://salt-formulas.readthedocs.io/
+* https://github.com/salt-formulas/salt-formula-rabbitmq/issues
+ In the unfortunate event that bugs are discovered, report the issue to the
+ appropriate issue tracker. Use the Github issue tracker for a specific salt
+ formula
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
+* https://launchpad.net/salt-formulas
+ For feature requests, bug reports, or blueprints affecting the entire
+ ecosystem, use the Launchpad salt-formulas project
- https://github.com/salt-formulas/salt-formula-rabbitmq/issues
+* https://launchpad.net/~salt-formulas-users
+ Join the salt-formulas-users team and subscribe to mailing list if required
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
+* https://github.com/salt-formulas/salt-formula-rabbitmq
+ Develop the salt-formulas projects in the master branch and then submit pull
+ requests against a specific formula
- https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
- https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
- https://github.com/salt-formulas/salt-formula-rabbitmq
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
- #salt-formulas @ irc.freenode.net
+* #salt-formulas @ irc.freenode.net
+ Use this IRC channel in case of any questions or feedback which is always
+ welcome
diff --git a/rabbitmq/files/rabbitmq.config b/rabbitmq/files/rabbitmq.config
index 4cef5ca..799153b 100644
--- a/rabbitmq/files/rabbitmq.config
+++ b/rabbitmq/files/rabbitmq.config
@@ -30,10 +30,10 @@
{%- if server.ssl.ciphers is defined %}
{ciphers,[ {{ server.ssl.ciphers | join("', '") }} ]},
{%- endif %}
- {fail_if_no_peer_cert,false}]}
-
+ {fail_if_no_peer_cert,{{ server.get('x509', {'enabled': False}).enabled |lower }}}
+ ]
+ }
{% endif %}
-
]
}
{%- if 'rabbitmq_management' in server.plugins %},