Merge "repair ceph_nfs container start failed"

This commit is contained in:
Zuul 2019-01-23 07:21:51 +00:00 committed by Gerrit Code Review
commit 78375d548f
4 changed files with 27 additions and 2 deletions

View File

@ -55,3 +55,16 @@
- "ceph-mgr"
- "ceph-mds"
- "ceph-nfs"
- name: Copying over ganesha.conf for ceph-nfs
template:
src: "{{ item }}"
dest: "{{ node_config_directory }}/ceph-nfs/ganesha.conf"
mode: 0600
become: true
when:
- inventory_hostname in groups['ceph-nfs']
with_first_found:
- "{{ node_custom_config }}/ganesha.conf"
- "{{ node_custom_config }}/ceph-nfs/ganesha.conf"
- "ganesha.conf.j2"

View File

@ -58,3 +58,16 @@
- "{{ ceph_files['ceph.client.admin.keyring'] }}"
- "{{ ceph_files['ceph.client.radosgw.keyring'] }}"
when: inventory_hostname in groups['ceph-rgw']
- name: Pushing Ceph keyrings for NFSs
become: true
bslurp:
src: "{{ item.content }}"
dest: "{{ node_config_directory }}/ceph-nfs/{{ item.filename }}"
sha1: "{{ item.sha1 }}"
mode: 0600
with_items:
- "{{ ceph_files['ceph.client.admin.keyring'] }}"
when:
- inventory_hostname in groups['ceph-nfs']
- enable_ceph_nfs | bool

View File

@ -1,5 +1,5 @@
{
"command": "/usr/bin/ganesha.nfsd -f /etc/ganesha/ganesha.conf",
"command": "/usr/bin/ganesha.nfsd -F -f /etc/ganesha/ganesha.conf",
"config_files": [
{
"source": "{{ container_config_directory }}/ganesha.conf",

View File

@ -14,7 +14,6 @@ EXPORT
FSAL {
Name = CEPH;
User_Id = "admin";
}
}