commit e4f91f9f6b660cb7abcbc2ee0699e3edccdc6374
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon May 27 13:54:47 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon May 27 13:54:47 2019 +0000
tree 72176b6d03283546190b150766609b689697db35
parent 72e0a6e408779c8a5d7afd2c6f0c52598aba46b0
parent d3fb3693e828d59f7489b201a55aa913e202397e

Merge "Use single name of systemd service for glusterfs server" into release/2019.2.0

glusterfs/map.jinja

diff --git a/glusterfs/map.jinja b/glusterfs/map.jinja
index 91f46fb..96c673a 100644
--- a/glusterfs/map.jinja
+++ b/glusterfs/map.jinja
@@ -1,14 +1,7 @@
-{# Backward compatibility issue, remove when old versions (<3.11.3) are not used any more #}
-{% if salt['pkg.version_cmp'](salt['pkg.version']('glusterfs-server'), '3.11.3') >= 0 %}
-    {% set systemd_service = 'glusterd' %}
-{% else %}
-    {% set systemd_service = 'glusterfs-server' %}
-{% endif %}
-
 {% set server = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['glusterfs-server','bc', 'attr'],
-        'service': systemd_service,
+        'service': 'glusterd',
     },
     'RedHat': {
         'pkgs': ['glusterfs-server','bc'],

glusterfs/server/service.sls

diff --git a/glusterfs/server/service.sls b/glusterfs/server/service.sls
index ab83cb4..0a659ff 100644
--- a/glusterfs/server/service.sls
+++ b/glusterfs/server/service.sls
@@ -51,7 +51,7 @@
 glusterfs_sleep:
   cmd.wait:
     - name: sleep 5
-    - watch-in:
+    - watch_in:
       - service: stop_glusterfs_service
 
       {%- endif %}
@@ -61,6 +61,7 @@
 glusterfs_service:
   service.running:
     - name: {{ server.service }}
+    - enable: true
     - require:
       - pkg: glusterfs_packages
 
@@ -74,6 +75,9 @@
     - contents: |
         [Service]
         ExecStartPost=/bin/sleep 5
+        RemainAfterExit=no
+    - require_in:
+      - service: glusterfs_service
   {%- endif %}
 
   {%- if server.volumes is defined %}