diff --git a/defaults/main.yml b/defaults/main.yml index 85645e2..00c9947 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,7 +35,6 @@ qdrouterd_listener_auth_peer: "no" qdrouterd_listener_sasl_mech: "ANONYMOUS" qdrouterd_irl_addr: 0.0.0.0 qdrouterd_irl_port: 31460 -qdrouterd_mode: "standalone" qdrouterd_worker_threads: 4 qdrouterd_sasl_conf_path: "/etc/sasl2/" qdrouterd_sasl_conf_file: "/etc/sasl2/qdrouterd.conf" diff --git a/templates/qdrouterd.conf.j2 b/templates/qdrouterd.conf.j2 index 504b935..4166cbb 100644 --- a/templates/qdrouterd.conf.j2 +++ b/templates/qdrouterd.conf.j2 @@ -2,7 +2,7 @@ router { mode: {{ qdrouterd_mode }} id: {{ ansible_hostname }} - workerThreads: {{ qdrouterd_host_count }} + workerThreads: {{ qdrouterd_worker_threads }} saslConfigPath: {{ qdrouterd_sasl_conf_path }} saslConfigName: {{ qdrouterd_service_name }} } @@ -23,6 +23,16 @@ listener { } {% endif %} +{% for router in groups['qdrouterd_all'] %} +{% if inventory_hostname < router %} +connector { + host: {{ hostvars[router]['ansible_eth0']['ipv4']['address'] }} + role: inter-router + port: {{ qdrouterd_irl_port }} +} +{% endif %} +{% endfor %} + address { prefix: unicast distribution: closest