x
/
fuel-ccp-rabbitmq
Code Issues Proposed changes

Add per service switch to rabbitmq 

Change-Id: Ied83e12b91944a96a870135f0f4a0aed9f9c9d29
This commit is contained in:
Proskurin Kirill 2017-02-09 14:02:50 +00:00
parent d5eac9e469
commit f5d5b62c5d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/defaults.yaml
View File

@ -12,6 +12,8 @@ configs:
password: password password: password
erlang_cookie: erlang_cookie erlang_cookie: erlang_cookie
user: rabbitmq user: rabbitmq
tls:
enabled: true
# How many seconds we give a node before making liveness checks # How many seconds we give a node before making liveness checks
# completely strict # completely strict

16
service/files/rabbitmq.config.j2
View File

@ -1,13 +1,13 @@
[ [
{rabbit, [ {rabbit, [
{dummy_param_without_comma, true} {dummy_param_without_comma, true}
{% if not security.tls.enabled %} {% if security.tls.enabled and rabbitmq.tls.enabled %}
,{tcp_listeners, [ ,{tcp_listeners, [] }
,{ssl_listeners, [
{"0.0.0.0", {{ rabbitmq.port.cont }} } {"0.0.0.0", {{ rabbitmq.port.cont }} }
]} ]}
{% else %} {% else %}
,{tcp_listeners, [] } ,{tcp_listeners, [
,{ssl_listeners, [
{"0.0.0.0", {{ rabbitmq.port.cont }} } {"0.0.0.0", {{ rabbitmq.port.cont }} }
]} ]}
{% endif %} {% endif %}
@ -16,7 +16,7 @@
,{loopback_users, []} ,{loopback_users, []}
,{cluster_partition_handling, pause_minority} ,{cluster_partition_handling, pause_minority}
,{queue_master_locator, <<"random">>} ,{queue_master_locator, <<"random">>}
{% if security.tls.enabled %} {% if security.tls.enabled and rabbitmq.tls.enabled %}
,{ssl_options, [{cacertfile,"/opt/ccp/etc/tls/ca.pem"}, ,{ssl_options, [{cacertfile,"/opt/ccp/etc/tls/ca.pem"},
{certfile,"/opt/ccp/etc/tls/rabbitmq_certificate.pem"}, {certfile,"/opt/ccp/etc/tls/rabbitmq_certificate.pem"},
{keyfile,"/opt/ccp/etc/tls/rabbitmq_server_key.pem"}, {keyfile,"/opt/ccp/etc/tls/rabbitmq_server_key.pem"},
@ -32,10 +32,10 @@
,{cluster_cleanup, true} ,{cluster_cleanup, true}
,{cleanup_warn_only, false} ,{cleanup_warn_only, false}
,{etcd_ttl, 15} ,{etcd_ttl, 15}
{% if not security.tls.enabled %} {% if security.tls.enabled and etcd.tls.enabled %}
,{etcd_scheme, http}
{% else %}
,{etcd_scheme, https} ,{etcd_scheme, https}
{% else %}
,{etcd_scheme, http}
{% endif %} {% endif %}
,{etcd_host, "{{ address('etcd') }}"} ,{etcd_host, "{{ address('etcd') }}"}
,{etcd_port, {{ etcd.client_port.cont }}} ,{etcd_port, {{ etcd.client_port.cont }}}