diff options
| author | Adam King <47704447+adk3798@users.noreply.github.com> | 2024-03-19 15:03:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 15:03:16 +0100 |
| commit | 920886ac64286bdc4c9eec10bdb0deabdd89a9e2 (patch) | |
| tree | 21afd238a7476d1acb89a07089e145dfefb915e2 /src/cephadm/cephadm.py | |
| parent | Merge pull request #52760 from thotz/add-healthchecker-timeout-haproxy (diff) | |
| parent | mgr/cephadm: adapting unit tests to include provider file (diff) | |
| download | ceph-920886ac64286bdc4c9eec10bdb0deabdd89a9e2.tar.xz ceph-920886ac64286bdc4c9eec10bdb0deabdd89a9e2.zip | |
Merge pull request #55615 from rhcs-dashboard/grafana-mount-dashboards
mgr/cephadm: mount grafana dashboards from the path
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Diffstat (limited to 'src/cephadm/cephadm.py')
| -rwxr-xr-x | src/cephadm/cephadm.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 21523cd09ea..e08b1f9f650 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -736,8 +736,10 @@ def create_daemon_dirs( makedirs(os.path.join(data_dir_root, config_dir), uid, gid, 0o755) makedirs(os.path.join(data_dir_root, config_dir, 'certs'), uid, gid, 0o755) makedirs(os.path.join(data_dir_root, config_dir, 'provisioning/datasources'), uid, gid, 0o755) - makedirs(os.path.join(data_dir_root, 'data'), uid, gid, 0o755) + makedirs(os.path.join(data_dir_root, config_dir, 'provisioning/dashboards'), uid, gid, 0o755) + makedirs(os.path.join(data_dir_root, 'data'), uid, gid, 0o472) touch(os.path.join(data_dir_root, 'data', 'grafana.db'), uid, gid) + recursive_chown(os.path.join(data_dir_root, 'data'), uid, gid) elif daemon_type == 'alertmanager': data_dir_root = ident.data_dir(ctx.data_dir) config_dir = 'etc/alertmanager' |