From 3c69fcc1bcfdfa87bd4ea4019a96234485ad2ac2 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 24 May 2021 23:57:22 +0200 Subject: [PATCH] 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 b2bfda46583fc9648ddf8dc8b29c70539d5f7f96) --- tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml | 1 + .../roles/tripleo_cephadm/templates/ceph-nfs.service.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml b/tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml index 9c7b6262b..c916acb3c 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml +++ b/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 diff --git a/tripleo_ansible/roles/tripleo_cephadm/templates/ceph-nfs.service.j2 b/tripleo_ansible/roles/tripleo_cephadm/templates/ceph-nfs.service.j2 index 6414cc17e..23cc30a45 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/templates/ceph-nfs.service.j2 +++ b/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 \