From a84b8b62a28909e66b78bf1599a41a7c64da3634 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 7 Jul 2023 00:00:10 +0200 Subject: [PATCH] server9: add new ssd --- hosts/server9/default.nix | 7 +++++++ hosts/server9/secrets.yaml | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hosts/server9/default.nix b/hosts/server9/default.nix index f77f3f07..e859057d 100644 --- a/hosts/server9/default.nix +++ b/hosts/server9/default.nix @@ -60,6 +60,7 @@ path = "/etc/machine-id"; }; secrets."ceph/osd.3/keyfile" = {}; + secrets."ceph/osd.7/keyfile" = {}; }; skyflake.nomad.client.meta."c3d2.cpuSpeed" = "3"; @@ -69,6 +70,12 @@ path = "/dev/zvol/tank/ceph-osd.3"; keyfile = config.sops.secrets."ceph/osd.3/keyfile".path; deviceClass = "hdd"; + } { + id = 7; + fsid = "a5450c3b-2e20-450b-a17a-d7938ee9d262"; + path = "/dev/disk/by-id/wwn-0x600300570140a0c02c39f0863bd3c53e"; + keyfile = config.sops.secrets."ceph/osd.7/keyfile".path; + deviceClass = "ssd"; } ]; # TODO: remove skyflake.storage.ceph.package = lib.mkForce pkgs.ceph_17_2; diff --git a/hosts/server9/secrets.yaml b/hosts/server9/secrets.yaml index 4c120210..eebd3c73 100644 --- a/hosts/server9/secrets.yaml +++ b/hosts/server9/secrets.yaml @@ -2,6 +2,8 @@ machine-id: ENC[AES256_GCM,data:YIOQJ21rswp+TE6sEKdNu0gP4iJ7K9ohrdXJRi5POoc=,iv: ceph: osd.3: keyfile: ENC[AES256_GCM,data:jz+zGf9sRCjxxHHa+5FVOjIS3S2xXvLr4CoOdnLDQIrQypT8p9rbcQ==,iv:QoCCR8EhcYZqGgT512ou8CyPXR8qGUvfmTqaoAXLLpc=,tag:LcFl3qc3W0BSlXMClfQvyQ==,type:str] + osd.7: + keyfile: ENC[AES256_GCM,data:yUDQ8bwnK7a++XFAVRJscbIxuBsLgef9ueGG6qujWNUyrmAZGvCMdg==,iv:MuLAqz5vcM92IuHEC/OeexSmXMdVYiwZgoxunlM0GHs=,tag:pR/JXDJSF1px7dzelpySeg==,type:str] sops: kms: [] gcp_kms: [] @@ -26,8 +28,8 @@ sops: dU1TaURPUWFOVW11bVNtd2J4OFhDMVUK6YIU1s2aPhY3HL9EFrzcuRoFObiLjc/t HOFh/iFJd6fFPia7HYLYyJ1bv6Blcz9K6I5i9Ptb1AM8RUrBWC7BGw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-01-07T00:23:15Z" - mac: ENC[AES256_GCM,data:SaOmnwmKjGmHZbcSBaDM2QK0+s68+2PmRe1mkLBNjAANTRIK9djxxXpBf2cpk7FAof+BNRJUa3Mcmy3r1b+LPBrzxK0aGLwRunN+Vc8xGMYQhJObVHbcwQkJg490dHW+jZ6vROxunwghq0/sAeKUbRgCf64TpbBgFt2DRMz1mIM=,iv:kKCEWzQvgXPr7YVtjCwp4ld2mTFD29kQov2gotH400c=,tag:cByRU1D529KZCFuc3pXOHQ==,type:str] + lastmodified: "2023-07-06T21:59:36Z" + mac: ENC[AES256_GCM,data:B1Z4Raxaax1O6Es/TsD7gn+uZ5HyvVxngxTOBpRFEn3OtJFHZSNMap/4J9XxlXZg4DzYe7peLb8PJ8cMoADmQ3rucuC6PGa1zgokfU3HCpFm+I9wookeW/pPUCRaupz2DU+Av3qy0zI2QP6yOfgJy57vHq+nsLvCXWRF/sRos+I=,iv:mhaiqSsDBp4EQSRndMfJO419zDtl9WrEZwUm3gzDVv8=,tag:TGF7Ps1vUeHL3j0/Rh5Gzg==,type:str] pgp: - created_at: "2022-12-27T22:59:15Z" enc: |