diff --git a/defaults/main.yml b/defaults/main.yml index 6d0eb29c..c98680d0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -158,7 +158,7 @@ rabbitmq_pki_certificates: - name: "rabbitmq_{{ ansible_facts['hostname'] }}" provider: ownca cn: "{{ ansible_facts['hostname'] }}" - san: "{{ 'DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ rabbitmq_node_address }}" + san: "{{ 'DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ rabbitmq_node_address ~ ',DNS:' ~ ansible_facts['fqdn'] }}" signed_by: "{{ rabbitmq_pki_intermediate_cert_name }}" # RabbitMQ destination files for SSL certificates @@ -226,6 +226,8 @@ rabbitmq_process_limit: 1048576 # Limit memory consumption of the erlang VM rabbitmq_memory_high_watermark: 0.2 +rabbitmq_env_use_longname: false + # Extra arguments passed to Erlang on startup # rabbitmq_erlang_extra_args: "+sbwt none +sbwtdcpu none +sbwtdio none +stbt nnts" rabbitmq_erlang_extra_args: "" diff --git a/releasenotes/notes/rabbitmq_longnames_config-d20b703185074acd.yaml b/releasenotes/notes/rabbitmq_longnames_config-d20b703185074acd.yaml new file mode 100644 index 00000000..5dee6300 --- /dev/null +++ b/releasenotes/notes/rabbitmq_longnames_config-d20b703185074acd.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Add ability to set the environment variable ``RABBITMQ_USE_LONGNAMES`` + via the ``rabbitmq-env.conf`` to be able to use the FQDN of a node. + By default this will be set to ``false``, the default value also set + by RabbitMQ. diff --git a/templates/rabbitmq-env.j2 b/templates/rabbitmq-env.j2 index 1c53aa14..c6417105 100644 --- a/templates/rabbitmq-env.j2 +++ b/templates/rabbitmq-env.j2 @@ -1,10 +1,12 @@ # {{ ansible_managed }} # Set ERLANG VM parameters -NODENAME=rabbit@{{ ansible_facts['hostname'] }} +NODENAME=rabbit@{{ ansible_facts['fqdn'] if rabbitmq_env_use_longname else ansible_facts['hostname'] }} RABBITMQ_IO_THREAD_POOL_SIZE={{ rabbitmq_async_threads }} RABBITMQ_SERVER_ERL_ARGS="+P {{ rabbitmq_process_limit }}" +USE_LONGNAME={{ rabbitmq_env_use_longname | bool | lower }} + {% if rabbitmq_erlang_extra_args %} RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="{{ rabbitmq_erlang_extra_args }}" {% endif %}