From 477f86e305dad39988be46a190cc21afbd382c3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 8 Sep 2017 19:28:52 +0200 Subject: [PATCH] switch to container: fix ceph nfs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The service is nfs-ganesha where ceph-nfs@{{ ansible_hostname }} will be the name of the container. Signed-off-by: Sébastien Han --- group_vars/nfss.yml.sample | 2 +- ...from-non-containerized-to-containerized-ceph-daemons.yml | 2 +- roles/ceph-nfs/defaults/main.yml | 2 +- roles/ceph-nfs/tasks/docker/start_docker_nfs.yml | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample index aa0b113e6..af8dfafa0 100644 --- 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 c6a1c6d21..a924d5eed 100644 --- 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 f731e820c..786099d27 100644 --- 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 59743d942..254ecf4e5 100644 --- 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 - -- 2.39.5