openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Make ceph-nfs service source path for /etc/ceph configurable" into stable/wallaby

This commit is contained in:
Zuul 2021-06-04 23:59:09 +00:00 committed by Gerrit Code Review
parent 1b1f2a955b 3c69fcc1bc
commit 0da9e8c64d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml
View File

@ -28,6 +28,7 @@ tripleo_cephadm_bootstrap_files:
tripleo_cephadm_uid: "167" tripleo_cephadm_uid: "167"
tripleo_cephadm_mode: "0755" tripleo_cephadm_mode: "0755"
tripleo_cephadm_keyring_permissions: "0644" tripleo_cephadm_keyring_permissions: "0644"
tripleo_ceph_client_config_home: "/etc/ceph"
tripleo_ceph_client_vars: "/home/stack/ceph_client.yaml" tripleo_ceph_client_vars: "/home/stack/ceph_client.yaml"
tripleo_cephadm_dashboard_enabled: false tripleo_cephadm_dashboard_enabled: false
tripleo_cephadm_wait_for_mons: true tripleo_cephadm_wait_for_mons: true

2
tripleo_ansible/roles/tripleo_cephadm/templates/ceph-nfs.service.j2
View File

@ -15,7 +15,7 @@ ExecStartPre={{ '/bin/mkdir' if ansible_facts['os_family'] == 'Debian' else '/us
ExecStart=/usr/bin/{{ container_cli }} run --rm --net=host \ ExecStart=/usr/bin/{{ container_cli }} run --rm --net=host \
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \ -d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
-v /var/lib/ceph:/var/lib/ceph:z \ -v /var/lib/ceph:/var/lib/ceph:z \
-v /etc/ceph:/etc/ceph:z \ -v {{ tripleo_ceph_client_config_home }}:/etc/ceph:z \
-v /var/lib/nfs/ganesha:/var/lib/nfs/ganesha:z \ -v /var/lib/nfs/ganesha:/var/lib/nfs/ganesha:z \
-v /etc/ganesha:/etc/ganesha:z \ -v /etc/ganesha:/etc/ganesha:z \
-v /var/run/ceph:/var/run/ceph:z \ -v /var/run/ceph:/var/run/ceph:z \