Browse Source

Make ceph-nfs service source path for /etc/ceph configurable

Within the container this directory will always appear mounted in
/etc/ceph but the ceph_client role itself might have generated it
in a different path (on the host) depending on CephConfigPath param

Change-Id: I12155b4a88b811d701f9fb6d1506b5592b58767b
(cherry picked from commit b2bfda4658)
changes/21/793921/1
Giulio Fidente 2 months ago
parent
commit
3c69fcc1bc
  1. 1
      tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml
  2. 2
      tripleo_ansible/roles/tripleo_cephadm/templates/ceph-nfs.service.j2

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

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

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

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

Loading…
Cancel
Save