Merge pull request #1761 from lsst-it/IT-5635/puppet-s3daemon-2.x.x

jhoblitt · web-flow · commit 73a0751abfe6 · 2025-05-15T11:47:36.000-07:00
(common) Update dependency lsst/s3daemon to v2
diff --git a/Puppetfile b/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', '1.2.0'
+mod 'lsst/s3daemon', '2.0.0'
 mod 'lsst/smee', '2.4.0'
 mod 'puppet/alternatives', '6.0.0'
 mod 'puppet/archive', '7.1.0'
diff --git a/hieradata/site/cp/cluster/auxtel-ccs.yaml b/hieradata/site/cp/cluster/auxtel-ccs.yaml
@@ -1,10 +1,12 @@
 ---
 s3daemon::instances:
   cp-latiss:
-    s3_endpoint_url: "https://s3.cp.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
+      S3DAEMON_PORT: 15570
   s3dfrgw-latiss:
-    s3_endpoint_url: "https://s3dfrgw.slac.stanford.edu"
-    port: 15580
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/hieradata/site/cp/cluster/comcam-ccs.yaml b/hieradata/site/cp/cluster/comcam-ccs.yaml
@@ -3,10 +3,12 @@ profile::ccs::monitoring::mrtg: true
 
 s3daemon::instances:
   cp-comcam:
-    s3_endpoint_url: "https://s3.cp.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
+      S3DAEMON_PORT: 15570
   sdfembs3-comcam:
-    s3_endpoint_url: "https://sdfembs3.sdf.slac.stanford.edu"
-    port: 15580
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/hieradata/site/cp/cluster/lsstcam-ccs.yaml b/hieradata/site/cp/cluster/lsstcam-ccs.yaml
@@ -15,14 +15,12 @@ profile::ccs::monitoring::mrtg: true
 
 s3daemon::instances:
   cp-lsstcam:
-    s3_endpoint_url: "https://s3.cp.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.cp.lsst.org"
+      S3DAEMON_PORT: 15570
   sdfembs3-lsstcam:
-    s3_endpoint_url: "https://sdfembs3.sdf.slac.stanford.edu"
-    port: 15580
-    image: "%{alias('s3daemon_default_image')}"
-  elqui-lsstcam:  # XXX temporary for testing
-    s3_endpoint_url: "https://s3.elqui.cp.lsst.org"
-    port: 15590
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/hieradata/site/ls/cluster/auxtel-ccs.yaml b/hieradata/site/ls/cluster/auxtel-ccs.yaml
@@ -21,10 +21,12 @@ clustershell::groupmembers:
 
 s3daemon::instances:
   ls-latiss:
-    s3_endpoint_url: "https://s3.ls.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.ls.lsst.org"
+      S3DAEMON_PORT: 15570
   s3dfrgw-latiss:
-    s3_endpoint_url: "https://s3dfrgw.slac.stanford.edu"
-    port: 15580
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/hieradata/site/ls/cluster/lsstcam-ccs.yaml b/hieradata/site/ls/cluster/lsstcam-ccs.yaml
@@ -15,6 +15,7 @@ ccs_monit::alert:
 
 s3daemon::instances:
   ls-lsstcam:
-    s3_endpoint_url: "https://s3.ls.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.ls.lsst.org"
+      S3DAEMON_PORT: 15570
diff --git a/hieradata/site/tu/cluster/auxtel-ccs.yaml b/hieradata/site/tu/cluster/auxtel-ccs.yaml
@@ -15,10 +15,12 @@ postfix::relayhost: "[mail.lsst.org]:submission"
 
 s3daemon::instances:
   tu-latiss:
-    s3_endpoint_url: "https://s3.tu.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.tu.lsst.org"
+      S3DAEMON_PORT: 15570
   s3dfrgw-latiss:
-    s3_endpoint_url: "https://s3dfrgw.slac.stanford.edu"
-    port: 15580
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/hieradata/site/tu/cluster/comcam-ccs.yaml b/hieradata/site/tu/cluster/comcam-ccs.yaml
@@ -15,10 +15,12 @@ postfix::relayhost: "[mail.lsst.org]:submission"
 
 s3daemon::instances:
   tu-comcam:
-    s3_endpoint_url: "https://s3.tu.lsst.org"
-    port: 15570
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3.tu.lsst.org"
+      S3DAEMON_PORT: 15570
   s3dfrgw-comcam:
-    s3_endpoint_url: "https://s3dfrgw.slac.stanford.edu"
-    port: 15580
     image: "%{alias('s3daemon_default_image')}"
+    env:
+      S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
+      S3DAEMON_PORT: 15580
diff --git a/spec/hosts/nodes/auxtel-dc01.cp.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-dc01.cp.lsst.org_spec.rb
@@ -51,17 +51,21 @@
 
       it do
         is_expected.to contain_s3daemon__instance('cp-latiss').with(
-          s3_endpoint_url: 'https://s3.cp.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
       it do
         is_expected.to contain_s3daemon__instance('s3dfrgw-latiss').with(
-          s3_endpoint_url: 'https://s3dfrgw.slac.stanford.edu',
-          port: 15_580,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
+            'S3DAEMON_PORT' => 15_580,
+          }
         )
       end
 
diff --git a/spec/hosts/nodes/auxtel-dc01.ls.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-dc01.ls.lsst.org_spec.rb
@@ -31,17 +31,21 @@
 
       it do
         is_expected.to contain_s3daemon__instance('ls-latiss').with(
-          s3_endpoint_url: 'https://s3.ls.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.ls.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
       it do
         is_expected.to contain_s3daemon__instance('s3dfrgw-latiss').with(
-          s3_endpoint_url: 'https://s3dfrgw.slac.stanford.edu',
-          port: 15_580,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
+            'S3DAEMON_PORT' => 15_580,
+          }
         )
       end
 
diff --git a/spec/hosts/nodes/auxtel-dc01.tu.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-dc01.tu.lsst.org_spec.rb
@@ -29,17 +29,21 @@
 
       it do
         is_expected.to contain_s3daemon__instance('tu-latiss').with(
-          s3_endpoint_url: 'https://s3.tu.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.tu.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
       it do
         is_expected.to contain_s3daemon__instance('s3dfrgw-latiss').with(
-          s3_endpoint_url: 'https://s3dfrgw.slac.stanford.edu',
-          port: 15_580,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
+            'S3DAEMON_PORT' => 15_580,
+          }
         )
       end
 
diff --git a/spec/hosts/nodes/comcam-dc01.cp.lsst.org_spec.rb b/spec/hosts/nodes/comcam-dc01.cp.lsst.org_spec.rb
@@ -29,17 +29,21 @@
 
       it do
         is_expected.to contain_s3daemon__instance('cp-comcam').with(
-          s3_endpoint_url: 'https://s3.cp.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
       it do
         is_expected.to contain_s3daemon__instance('sdfembs3-comcam').with(
-          s3_endpoint_url: 'https://sdfembs3.sdf.slac.stanford.edu',
-          port: 15_580,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
+            'S3DAEMON_PORT' => 15_580,
+          }
         )
       end
 
diff --git a/spec/hosts/nodes/comcam-dc01.tu.lsst.org_spec.rb b/spec/hosts/nodes/comcam-dc01.tu.lsst.org_spec.rb
@@ -29,9 +29,11 @@
 
       it do
         is_expected.to contain_s3daemon__instance('tu-comcam').with(
-          s3_endpoint_url: 'https://s3.tu.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.tu.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
diff --git a/spec/hosts/nodes/lsstcam-dc01.ls.lsst.org_spec.rb b/spec/hosts/nodes/lsstcam-dc01.ls.lsst.org_spec.rb
@@ -31,9 +31,11 @@
 
       it do
         is_expected.to contain_s3daemon__instance('ls-lsstcam').with(
-          s3_endpoint_url: 'https://s3.ls.lsst.org',
-          port: 15_570,
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3.ls.lsst.org',
+            'S3DAEMON_PORT' => 15_570,
+          }
         )
       end
 
diff --git a/spec/support/spec/lsstcam.rb b/spec/support/spec/lsstcam.rb
@@ -3,25 +3,21 @@
 shared_examples 'lsstcam-dc.cp' do
   it do
     is_expected.to contain_s3daemon__instance('cp-lsstcam').with(
-      s3_endpoint_url: 'https://s3.cp.lsst.org',
-      port: 15_570,
-      image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+      image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+      env: {
+        'S3_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
+        'S3DAEMON_PORT' => 15_570,
+      }
     )
   end
 
   it do
     is_expected.to contain_s3daemon__instance('sdfembs3-lsstcam').with(
-      s3_endpoint_url: 'https://sdfembs3.sdf.slac.stanford.edu',
-      port: 15_580,
-      image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
-    )
-  end
-
-  it do
-    is_expected.to contain_s3daemon__instance('elqui-lsstcam').with(
-      s3_endpoint_url: 'https://s3.elqui.cp.lsst.org',
-      port: 15_590,
-      image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9'
+      image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+      env: {
+        'S3_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
+        'S3DAEMON_PORT' => 15_580,
+      }
     )
   end
 end
