Split enq configuration files into worker/server

roles/queue/tasks/main.yml

@@ -16,10 +16,18 @@
       - enq-server.service
       - enq-worker.service
 
+- name: Remove old configuration file
+  file:
+    path: "/etc/default/enq"
+    state: absent
+
 - name: Configure queuing system (enq)
   template:
-    src: "enq.default.j2"
-    dest: "/etc/default/enq"
+    src: "{{ item }}.default.j2"
+    dest: "/etc/default/{{ item }}"
+  loop:
+    - enq-worker
+    - enq-server
   notify: reload enq
 
 - name: Enable enq systemd units

roles/queue/templates/enq.default.j2 → roles/queue/templates/enq-server.default.j2

 SERVER_OPTIONS="--shard={{ shard_id }} --addr=:3733 --http-addr=:3734 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/server/cert.pem --ssl-key=/etc/credentials/x509/enq/server/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem --topology=dynamic:%s.queue.{{ domain }}:3733"
-
-WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"

roles/queue/templates/enq-worker.default.j2

+WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"