Merge pull request #14 from galaxyproject/multiple-systemd-instances

Support multiple Pulsar servers on the same host when using systemd

defaults/main.yml

@@ -70,9 +70,11 @@ pulsar_pycurl_ssl_library: >-
 # pulsar_systemd: true
 pulsar_systemd: false
 pulsar_systemd_enabled: true
+pulsar_systemd_service_name: pulsar
 pulsar_systemd_state: started
 pulsar_systemd_memory_limit: 6 # Gigabytes
 pulsar_systemd_runner: paste # Or webless or uWSGI, but uwsgi doesn't restart right.
+pulsar_systemd_environment: [] # List of VAR=value
 
 
 # User management

handlers/main.yml

@@ -7,6 +7,6 @@
 
 - name: default restart pulsar handler
   systemd:
-    name: pulsar.service
+    name: "{{ pulsar_systemd_service_name }}.service"
     state: restarted
   when: pulsar_systemd

tasks/systemd.yml

@@ -1,16 +1,16 @@
 ---
-- name: Setup SystemD
+- name: Setup systemd
   block:
     - name: Create Pulsar systemd unit file
       template:
         src: "pulsar.service.j2"
-        dest: "/etc/systemd/system/pulsar.service"
+        dest: "/etc/systemd/system/{{ pulsar_systemd_service_name }}.service"
 
-    - name: SystemD daemon-reload and enable/start service
+    - name: systemd daemon-reload and enable/start service
       systemd:
         state: "{{ pulsar_systemd_state }}"
         enabled: "{{ pulsar_systemd_enabled }}"
-        name: pulsar.service
+        name: "{{ pulsar_systemd_service_name }}.service"
         daemon_reload: yes
 
   remote_user: "{{ pulsar_remote_users.root | default(__pulsar_remote_user) }}"

templates/pulsar.service.j2

@@ -18,6 +18,9 @@ ExecStart={{ pulsar_venv_dir }}/bin/pulsar -c {{ pulsar_config_dir }} -m webless
 {% else %}
 ExecStart={{ pulsar_venv_dir }}/bin/uwsgi --ini-paste {{ pulsar_config_dir }}/server.ini
 {% endif %}
+{% for env in pulsar_systemd_environment %}
+Environment={{ env }}
+{% endfor %}
 MemoryLimit={{ pulsar_systemd_memory_limit }}G
 Restart=always