Mercurial > code > home > repos > infra

changeset 194:0d37dde619d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zfs now serving from ditto, new pool is stor7
author drewp@bigasterisk.com
date Wed, 14 Jun 2023 17:00:13 -0700
parents a882fb1fa000
children ee6374edfc06
files files/fstab/bang files/fstab/dash files/fstab/ditto files/fstab/slash system.py templates/hosts.j2
diffstat 6 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/files/fstab/bang	Mon Jun 12 13:08:17 2023 -0700
+++ b/files/fstab/bang	Wed Jun 14 17:00:13 2023 -0700
@@ -5,5 +5,4 @@
 /dev/disk/by-uuid/d9a1e1e4-9eba-4988-8b01-c5f6732a2972 /d3 ext4 noatime 0 0
 /dev/disk/by-partuuid/77687eec-15bf-9345-b420-bb83659e6a6b /d4 ext4 noatime 0 0
 
-#/stor6/my/ /my none defaults,bind,nofail,x-systemd.device-timeout=2 0 0
-
+ditto5:/my                           /my       nfs  defaults          0       0
--- a/files/fstab/dash	Mon Jun 12 13:08:17 2023 -0700
+++ b/files/fstab/dash	Wed Jun 14 17:00:13 2023 -0700
@@ -5,5 +5,6 @@
 UUID=b88f75cd-9022-4af9-a11b-5a5a1fbd3132 /d2  ext4  defaults 0 0
 UUID=3b6780e0-ec86-43be-8d09-e462dbad762e /d3  ext4  defaults 0 0
 UUID=73bcd201-5f77-4f68-9fba-47835c3c1692 /d4  ext4  defaults 0 0
-/swap.img	none	swap	sw	0	0
-bang5:/stor6/my /my nfs4 defaults 0 0
+#/swap.img	none	swap	sw	0	0
+
+ditto5:/my                           /my       nfs  defaults          0       0
--- a/files/fstab/ditto	Mon Jun 12 13:08:17 2023 -0700
+++ b/files/fstab/ditto	Wed Jun 14 17:00:13 2023 -0700
@@ -7,10 +7,7 @@
 # that works even if disks are added and removed. See fstab(5).
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
-# / was on /dev/nvme0n1p2 during curtin installation
 /dev/disk/by-uuid/6e64ce62-34db-4084-9385-d001e99ad38b / ext4 defaults 0 1
-# /boot/efi was on /dev/nvme0n1p1 during curtin installation
 /dev/disk/by-uuid/3F95-42F4 /boot/efi vfat defaults 0 1
 
-bang5:/stor6/my      /my         nfs defaults 0 0
 bang5:/d4/photoprism /photoprism nfs defaults 0 0
--- a/files/fstab/slash	Mon Jun 12 13:08:17 2023 -0700
+++ b/files/fstab/slash	Wed Jun 14 17:00:13 2023 -0700
@@ -3,4 +3,5 @@
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 UUID=df079890-9431-4e17-940c-d9ed8ce4e149 /         ext4 errors=remount-ro 0       1
 UUID=1CFA-995B                            /boot/efi vfat umask=0077        0       1
-bang5:/stor6/my                           /my       nfs  defaults          0       0
+
+ditto5:/my                           /my       nfs  defaults          0       0
--- a/system.py	Mon Jun 12 13:08:17 2023 -0700
+++ b/system.py	Wed Jun 14 17:00:13 2023 -0700
@@ -54,6 +54,7 @@
         files.template(src="templates/webforward.service.j2", dest=f"/etc/systemd/system/web_forward_{port}.service", port=port)
         systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True)
 
+# todo move to k8s (and run on ditto, and record pool status too)
 def zfs_metrics():
     files.put(src='files/zfs_metrics/zfs_space_metrics.sh', dest='/opt/zfs_metrics/zfs_space_metrics.sh')
     files.put(src='files/zfs_metrics/zfs.mtail', dest='/opt/zfs_metrics/zfs.mtail')
@@ -78,7 +79,7 @@
 if host.name in ['bang', 'pipe', 'ditto']:
     no_sleep()
 
-if host.name == 'bang':
+if host.name in ['bang', 'ditto']:
     nfs_server()
     zfs_metrics()
 
--- a/templates/hosts.j2	Mon Jun 12 13:08:17 2023 -0700
+++ b/templates/hosts.j2	Wed Jun 14 17:00:13 2023 -0700
@@ -13,4 +13,5 @@
 
 {% if host.name in ['prime', 'piedmont'] %}
 10.5.0.1 bang bang.bigasterisk.com bang5 bang5.bigasterisk.com 
+10.5.0.7 ditto ditto.bigasterisk.com ditto5 ditto5.bigasterisk.com 
 {% endif %}