switch to container: fix ceph nfs

The service is nfs-ganesha where ceph-nfs@{{ ansible_hostname }} will be
the name of the container.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index aa0b113e65bf9296ab7e715ad2aa68d84cb2dc68..af8dfafa0b63e1e3733031a4f0b31f52f8b2f82a 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -88,6 +88,6 @@ dummy:
 
 #ceph_docker_image: "ceph/ganesha"
 #ceph_docker_image_tag: latest
-#ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
+#ceph_nfs_docker_extra_env:
 #ceph_config_keys: [] # DON'T TOUCH ME
 

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index c6a1c6d213b88a15ebc4c613e21c1f4542c835f0..a924d5eedec7f2466be07c7c3964ab5e50570366 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -431,7 +431,7 @@
   pre_tasks:
     - name: stop non-containerized ceph nfs(s)
       service:
-        name: "ceph-nfs@{{ ansible_hostname }}"
+        name: nfs-ganesha
         state: stopped
         enabled: no
 

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index f731e820c7e512e5aa538bc855a63a622b36498d..786099d279630a61fc663e7d1412fe366cb66268 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -80,5 +80,5 @@ ceph_nfs_rgw_user: "cephnfs"
 
 ceph_docker_image: "ceph/ganesha"
 ceph_docker_image_tag: latest
-#ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
+ceph_nfs_docker_extra_env:
 ceph_config_keys: [] # DON'T TOUCH ME

diff --git a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
index 59743d942e4b353cb023d936ff739f7bf5755f41..254ecf4e57e1eb3afe5931107768057119c46055 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
+++ b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
@@ -24,9 +24,3 @@
     state: started
     enabled: yes
   changed_when: false
-
-- name: wait for ceph.conf exists
-  wait_for:
-      path: "/etc/ceph/{{ cluster }}.conf"
-  when: is_atomic
-