From 318188cc4b6b141bd9f980f8baefa20f3897fcca Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Sun, 16 Apr 2023 10:15:51 +0200
Subject: [PATCH] Replace symlink with bind-mount for default ceph directories

We cannot assume that these directories will be empty which causes
the snap layotu handling to fail. Changing to bind works around
this issue.

Closes #122

Signed-off-by: Chris MacNaughton <chris.macnaughton@canonical.com>
---
 snapcraft.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 144ce81c..cc70ec23 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,13 +19,13 @@ layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET/rados-classes:
     symlink: $SNAP/lib/$CRAFT_ARCH_TRIPLET/rados-classes
   /etc/ceph:
-    symlink: $SNAP_DATA/conf
+    bind: $SNAP_DATA/conf
   /usr/share/ceph:
-    symlink: $SNAP/share/ceph
+    bind: $SNAP/share/ceph
   /var/lib/ceph:
-    symlink: $SNAP_COMMON/data
+    bind: $SNAP_COMMON/data
   /var/log/ceph:
-    symlink: $SNAP_COMMON/logs
+    bind: $SNAP_COMMON/logs
 
 apps:
   # Service