Merge pull request #1157 from flyingcircusio/PL-133145-PL-133149-upda…

…te-fc-qemu fc.qemu: update to pull in last minute fixes
flyingcircusio · Nov 7, 2024 · 74caa31 · 74caa31
2 parents b493279 + 8ba27a4
commit 74caa31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkgs/fc/ceph/src/fc/ceph/keys/nautilus.py b/pkgs/fc/ceph/src/fc/ceph/keys/nautilus.py
@@ -219,7 +219,11 @@ class ClientKey(KeyConfig):
     filename = "/etc/ceph/ceph.client.{id}.keyring"
     entity = "client.{id}"
     # assumption: all clients are allowed to use RBD
-    capabilities = {"mon": "allow r, allow profile rbd", "osd": "allow rwx"}
+    capabilities = {
+        "mon": "allow r, allow profile rbd",
+        "mgr": "allow profile rbd",
+        "osd": "allow rwx",
+    }
 
 
 class RGWKey(KeyConfig):

diff --git a/pkgs/fc/default.nix b/pkgs/fc/default.nix
@@ -38,11 +38,13 @@ rec {
   neighbour-cache-monitor = callPackage ./neighbour-cache-monitor {};
   ping-on-tap = callPackage ./ping-on-tap {};
   qemu-nautilus = callPackage ./qemu rec {
-    version = "1.6";
+    version = "1.7dev";
     src = pkgs.fetchFromGitHub {
       owner = "flyingcircusio";
       repo = "fc.qemu";
-      rev = version;
+      # The release tooling didn't upgrade properly so we had to pick a specific
+      # commit instead.
+      rev = "b3344e47c5b12fdc51c0e2745f7dd052a904041c";
       hash = "sha256-oxV29okkTqkNm5HvwrwWS+hABcH7cd70mL83f72SLsQ=";
     };
     qemu_ceph = pkgs.qemu-ceph-nautilus;