Browse Source

server7: disable ceph mount

master
Emery Hemingway 2 months ago
parent
commit
5238abc7a7
1 changed files with 26 additions and 20 deletions
  1. 26
    20
      hosts/server7/default.nix

+ 26
- 20
hosts/server7/default.nix View File

@@ -14,7 +14,7 @@ in {
14 14
   ];
15 15
 
16 16
   security.acme = {
17
-    email = " mail@c3d2.de";
17
+    email = "mail@c3d2.de";
18 18
     acceptTerms = true;
19 19
   };
20 20
 
@@ -31,24 +31,22 @@ in {
31 31
     };
32 32
   };
33 33
 
34
-  fileSystems."/srv/ceph" = {
35
-    device = "172.22.99.13:6789:/";
36
-    fsType = "ceph";
37
-    options = [
38
-      "name=storage2"
39
-      "secret=AQAvRhxcaCK0IxAAnoe00oiopcpQeKZgL02RWw=="
40
-      "noatime,_netdev"
41
-      "noauto"
42
-      "x-systemd.automount"
43
-      "x-systemd.device-timeout=175"
44
-      "users"
45
-    ];
46
-  };
47
-
48
-  fileSystems."/var/lib/ceph/osd/ceph-7" = {
49
-    fsType = "tmpfs";
50
-  };
51
-
34
+  /* fileSystems."/srv/ceph" = {
35
+       device = "172.22.99.13:6789:/";
36
+       fsType = "ceph";
37
+       options = [
38
+         "name=storage2"
39
+         "secret=AQAvRhxcaCK0IxAAnoe00oiopcpQeKZgL02RWw=="
40
+         "noatime,_netdev"
41
+         "noauto"
42
+         "x-systemd.automount"
43
+         "x-systemd.device-timeout=175"
44
+         "users"
45
+       ];
46
+     };
47
+  */
48
+
49
+  fileSystems."/var/lib/ceph/osd/ceph-7" = { fsType = "tmpfs"; };
52 50
 
53 51
   # Route IPv6
54 52
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
@@ -116,7 +114,9 @@ in {
116 114
       [ "/dev:/dev" "/etc/ceph:/etc/ceph" "/var/lib/ceph/:/var/lib/ceph" ];
117 115
   };
118 116
   systemd.services.docker-ceph-osd-7.serviceConfig = {
119
-      ExecStartPre = [''-${pkgs.docker}/bin/docker run --rm --net=host  --ipc=host --privileged=true -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph/:/var/lib/ceph -e OSD_DEVICE=/dev/sdb -it ceph/ceph:v14.2.9 ceph-volume lvm activate --all''];
117
+    ExecStartPre = [
118
+      "-${pkgs.docker}/bin/docker run --rm --net=host --ipc=host --privileged=true -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph/:/var/lib/ceph -e OSD_DEVICE=/dev/sdb -it ceph/ceph:v14.2.9 ceph-volume lvm activate --all"
119
+    ];
120 120
   };
121 121
 
122 122
   networking = {
@@ -186,4 +186,10 @@ in {
186 186
     # allow the old hydra to build here
187 187
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra"
188 188
   ];
189
+
190
+  services.dhcpd4 = {
191
+    enable = false;
192
+    interfaces = [ "br0" ];
193
+    extraConfig = "not authoritative;";
194
+  };
189 195
 }

Loading…
Cancel
Save