Merge "Fix check of setting volume options" into release/2019.2.0
diff --git a/glusterfs/server/service.sls b/glusterfs/server/service.sls
index 15c3f92..ab83cb4 100644
--- a/glusterfs/server/service.sls
+++ b/glusterfs/server/service.sls
@@ -6,6 +6,28 @@
pkg.installed:
- names: {{ server.pkgs }}
+{# Backward compatibility issue, remove when old versions (<3.11.3) are not used any more #}
+glusterfs_service_symlink:
+ file.symlink:
+ - name: /etc/init.d/glusterd
+ - target: /etc/init.d/glusterfs-server
+ - require:
+ - pkg: glusterfs_packages
+ - require_in:
+ - service: glusterfs_service
+
+stop_old_glusterfs_service:
+ service.dead:
+ - name: glusterfs-server
+ - enable: False
+ - onchanges:
+ - file: glusterfs_service_symlink
+ - require_in:
+ - service: glusterfs_service
+ - onlyif:
+ ls /etc/init.d/glusterfs-server
+{# end of backward compatibility change #}
+
{%- if server.recover_peers is defined %}
{%- for peer_name, peer_data in server.recover_peers.iteritems() %}
{%- if peer_data.get('enabled', False) and grains.get('fqdn', 'unknown') == peer_name %}