Merge pull request #1983 from jprovaznik/suffix

Allow to override systemd service instance id

diff --cc group_vars/nfss.yml.sample
Simple merge

diff --cc roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2
index 800eb6df815e194a3c58215b5b08a371136ebdfb,22f974d98b0964a133eb01de30576bfb3def596d..5828e1ac63758f1706ac4a6b0a8c17d4bd53ed12
--- 1/roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2
--- 2/roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2
+++ b/roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2
@@@ -2,11 -2,8 +2,11 @@@
  
  RETRIES="{{ handler_health_nfs_check_retries }}"
  DELAY="{{ handler_health_nfs_check_delay }}"
- NFS_NAME="{{ ansible_hostname }}"
+ NFS_NAME="ceph-nfs@{{ ceph_nfs_service_suffix | default(ansible_hostname) }}"
  PID=/var/run/ganesha.pid
 +{% if containerized_deployment %}
 +DOCKER_EXEC="docker exec ceph-nfs-{{ ansible_hostname }}"
 +{% endif %}
  
  # First, restart the daemon
  {% if containerized_deployment -%}

diff --cc roles/ceph-nfs/defaults/main.yml
Simple merge

diff --cc roles/ceph-nfs/tasks/start_nfs.yml
Simple merge

diff --cc roles/ceph-nfs/templates/ceph-nfs.service.j2
Simple merge