ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1875 from ceph/switch-nfs 

switch to container: fix ceph nfs
pull/1840/head
Sébastien Han 2017-09-09 01:09:30 +02:00 committed by GitHub
parent d46d453b83 477f86e305
commit 6d90aef114
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/nfss.yml.sample
View File

@ -88,6 +88,6 @@ dummy:
#ceph_docker_image: "ceph/ganesha" #ceph_docker_image: "ceph/ganesha"
#ceph_docker_image_tag: latest #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 #ceph_config_keys: [] # DON'T TOUCH ME

2
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -431,7 +431,7 @@
pre_tasks: pre_tasks:
- name: stop non-containerized ceph nfs(s) - name: stop non-containerized ceph nfs(s)
service: service:
name: "ceph-nfs@{{ ansible_hostname }}" name: nfs-ganesha
state: stopped state: stopped
enabled: no enabled: no

2
roles/ceph-nfs/defaults/main.yml
View File

@ -80,5 +80,5 @@ ceph_nfs_rgw_user: "cephnfs"
ceph_docker_image: "ceph/ganesha" ceph_docker_image: "ceph/ganesha"
ceph_docker_image_tag: latest 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 ceph_config_keys: [] # DON'T TOUCH ME

6
roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
View File

@ -24,9 +24,3 @@
state: started state: started
enabled: yes enabled: yes
changed_when: false changed_when: false
- name: wait for ceph.conf exists
wait_for:
path: "/etc/ceph/{{ cluster }}.conf"
when: is_atomic