Merge pull request #1875 from ceph/switch-nfs

switch to container: fix ceph nfs
2017-09-09 01:09:30 +02:00 · 2017-09-09 01:09:30 +02:00 · 6d90aef114
parent d46d453b83 477f86e305
commit 6d90aef114
4 changed files with 3 additions and 9 deletions
--- 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

--- 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

--- 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
--- 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
-