(WIP) (*) replace s3daemon class with s3nd; rm s3daemon instances

Author: jhoblitt

Puppetfile

@@ -34,7 +34,7 @@ mod 'lsst/pi', '1.0.0'
 mod 'lsst/powertop', '0.1.2'
 mod 'lsst/rke', '2.1.0'
 mod 'lsst/rke2', '2.0.0'
-mod 'lsst/s3daemon', '2.1.0'
+mod 'lsst/s3nd', '1.0.0'
 mod 'lsst/smee', '2.4.0'
 mod 'puppet/alternatives', '6.0.0'
 mod 'puppet/archive', '7.1.0'

hieradata/cluster/lsstcam-ccs/role/ccs-dc.yaml

@@ -0,0 +1,3 @@
+---
+classes:
+  - "s3nd"

hieradata/common.yaml

@@ -107,7 +107,7 @@ lookup_options:
   cni::plugins::enable:
     merge:
       strategy: "deep"
-  s3daemon::instances:
+  s3nd::instances:
     merge:
       strategy: "deep"
 
@@ -574,12 +574,11 @@ restic::bucket: "rubin-bm-backups/%{facts.networking.fqdn}"
 restic::enable_backup: true
 restic::host: "s3.us-east-1.amazonaws.com"
 
-s3daemon_default_image: "ghcr.io/lsst-dm/s3daemon:sha-57e1aa9"
 s3nd_default_image: "ghcr.io/lsst-dm/s3nd:1.6.0"
-s3daemon::volumes:
+s3nd::volumes:
   - "/data:/data"
   - "/home:/home"
-s3daemon::env:
+s3nd::env:
   AWS_REGION: "lfa"
 
 pi::config::reboot: false  # XXX this should be removed when pi role/profile refactoring is complete

hieradata/role/auxtel-fp.yaml

@@ -8,3 +8,8 @@ classes:
   - "profile::core::debugutils"
   - "profile::core::nfsclient"
   - "profile::core::nfsserver"
+  - "s3nd"
+
+hosts::entries:
+  sdfembs3.sdf.slac.stanford.edu:
+    ip: "172.24.7.249"

hieradata/role/ccs-dc.yaml

@@ -8,7 +8,6 @@ classes:
   - "profile::core::debugutils"
   - "profile::core::nfsclient"
   - "profile::core::sysctl::lhn"
-  - "s3daemon"
 
 profile::ccs::common::sysctls: false
 

hieradata/role/comcam-fp.yaml

@@ -10,9 +10,14 @@ classes:
   - "profile::core::nfsclient"
   - "profile::core::nfsserver"
   - "profile::core::sysctl::lhn"
+  - "s3nd"
 
 profile::ccs::common::sysctls: false
 
+hosts::entries:
+  sdfembs3.sdf.slac.stanford.edu:
+    ip: "172.24.7.249"
+
 ccs_software::services:
   prod:
     - "comcam-daq-monitor"

hieradata/site/cp/cluster/auxtel-ccs.yaml

@@ -1,21 +1,11 @@
 ---
-s3daemon::instances:
+s3nd::instances:
   cp-latiss:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
-      S3DAEMON_PORT: 15570
-  cp-latiss-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://s3.cp.lsst.org"
       S3ND_PORT: 15571
   sdfembs3-latiss:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
-      S3DAEMON_PORT: 15580
-  sdfembs3-latiss-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"

hieradata/site/cp/cluster/comcam-ccs.yaml

@@ -1,23 +1,13 @@
 ---
 profile::ccs::monitoring::mrtg: true
 
-s3daemon::instances:
+s3nd::instances:
   cp-comcam:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
-      S3DAEMON_PORT: 15570
-  cp-comcam-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://s3.cp.lsst.org"
       S3ND_PORT: 15571
   sdfembs3-comcam:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
-      S3DAEMON_PORT: 15580
-  sdfembs3-comcam-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"

hieradata/site/cp/cluster/lsstcam-ccs.yaml

@@ -13,14 +13,8 @@ clustershell::groupmembers:
 
 profile::ccs::monitoring::mrtg: true
 
-s3daemon::instances:
+s3nd::instances:
   cp-lsstcam:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
-      S3DAEMON_PORT: 15570
-      S3DAEMON_HOST: "0.0.0.0"  # allow connections from other nodes for testing
-  cp-lsstcam-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://s3.cp.lsst.org"
@@ -32,12 +26,6 @@ s3daemon::instances:
       S3ND_UPLOAD_TIMEOUT: "3s"
       S3ND_UPLOAD_TRIES: "5"
   sdfembs3-lsstcam:
-    image: "%{alias('s3daemon_default_image')}"
-    env: &sdfembs3
-      S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
-      S3DAEMON_PORT: 15580
-      S3DAEMON_HOST: "0.0.0.0"  # allow connections from other nodes for testing
-  sdfembs3-lsstcam-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env: &sdfembss3nd
       S3ND_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
@@ -50,11 +38,6 @@ s3daemon::instances:
       S3ND_UPLOAD_TIMEOUT: "4s"
       S3ND_UPLOAD_TRIES: "3"
   sdfembs3-lsstcam-test:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      <<: *sdfembs3
-      S3DAEMON_PORT: 15590
-  sdfembs3-lsstcam-test-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       <<: *sdfembss3nd

hieradata/site/ls/cluster/auxtel-ccs.yaml

@@ -19,23 +19,13 @@ clustershell::groupmembers:
   #all: {group: "all", member: "@misc,@hcu"}
   all: {group: "all", member: "@misc"}
 
-s3daemon::instances:
+s3nd::instances:
   ls-latiss:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://s3.ls.lsst.org"
-      S3DAEMON_PORT: 15570
-  ls-latiss-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://s3.ls.lsst.org"
       S3ND_PORT: 15571
   s3dfrgw-latiss:
-    image: "%{alias('s3daemon_default_image')}"
-    env:
-      S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
-      S3DAEMON_PORT: 15580
-  s3dfrgw-latiss-s3nd:
     image: "%{alias('s3nd_default_image')}"
     env:
       S3ND_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"