From: Sébastien Han <seb@redhat.com>
Date: Fri, 6 Oct 2017 20:40:57 +0000 (+0200)
Subject: Merge pull request #1983 from jprovaznik/suffix
X-Git-Tag: v3.0.0rc18~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ac29e8f9770805c7a4405232efcde813af4f057b;p=ceph-ansible.git

Merge pull request #1983 from jprovaznik/suffix

Allow to override systemd service instance id
---

ac29e8f9770805c7a4405232efcde813af4f057b
diff --cc roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2
index 800eb6df8,22f974d98..5828e1ac6
--- a/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 -%}