(site/cp/cluster/lsstcam-ccs) add s3nd

Author: jhoblitt

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

@@ -19,8 +19,32 @@ s3daemon::instances:
     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"
+      S3ND_PORT: 15571
+      S3ND_HOST: ""  # allow connections from other nodes for testing
+      S3ND_UPLOAD_TIMEOUT: "3s"
+      S3ND_QUEUE_TIMEOUT: "30s"
+      S3ND_UPLOAD_MAX_PARALLEL: "25"
+      S3ND_UPLOAD_TRIES: "5"
   sdfembs3-lsstcam:
     image: "%{alias('s3daemon_default_image')}"
     env:
       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:
+      S3ND_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
+      S3ND_PORT: 15581
+      S3ND_HOST: ""  # allow connections from other nodes for testing
+      S3ND_UPLOAD_TIMEOUT: "10s"
+      S3ND_QUEUE_TIMEOUT: "30s"
+      S3ND_UPLOAD_MAX_PARALLEL: "25"
+      S3ND_UPLOAD_TRIES: "5"
+      S3ND_UPLOAD_PARTSIZE: "50Mi"  # larger than test file size
+      S3ND_UPLOAD_BWLIMIT: "160Mi"

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

@@ -3,9 +3,12 @@ s3daemon::instances:
   cp-lsstcam:
     aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
     aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
+  cp-lsstcam-s3nd:
+    aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
+    aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
   sdfembs3-lsstcam:
     aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
     aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
-  elqui-lsstcam:
+  sdfembs3-lsstcam-s3nd:
     aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
     aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"

spec/hosts/nodes/lsstcam-dc01.ls.lsst.org_spec.rb

@@ -73,7 +73,7 @@
             'S3ND_QUEUE_TIMEOUT' => '30s',
             'S3ND_UPLOAD_MAX_PARALLEL' => '25',
             'S3ND_UPLOAD_TRIES' => '5',
-            'S3ND_UPLOAD_PARTSIZE' => '50Mi',  # larger than test file size
+            'S3ND_UPLOAD_PARTSIZE' => '50Mi', # larger than test file size
             'S3ND_UPLOAD_BWLIMIT' => '160Mi',
           }
         )

spec/support/spec/lsstcam.rb

@@ -7,6 +7,22 @@
       env: {
         'S3_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
         'S3DAEMON_PORT' => 15_570,
+        'S3DAEMON_HOST' => '0.0.0.0',
+      }
+    )
+  end
+
+  it do
+    is_expected.to contain_s3daemon__instance('cp-lsstcam-s3nd').with(
+      image: 'ghcr.io/lsst-dm/s3nd:sha-1a94702',
+      env: {
+        'S3ND_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
+        'S3ND_PORT' => 15_571,
+        'S3ND_HOST' => '',
+        'S3ND_UPLOAD_TIMEOUT' => '3s',
+        'S3ND_QUEUE_TIMEOUT' => '30s',
+        'S3ND_UPLOAD_MAX_PARALLEL' => '25',
+        'S3ND_UPLOAD_TRIES' => '5',
       }
     )
   end
@@ -17,6 +33,24 @@
       env: {
         'S3_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
         'S3DAEMON_PORT' => 15_580,
+        'S3DAEMON_HOST' => '0.0.0.0',
+      }
+    )
+  end
+
+  it do
+    is_expected.to contain_s3daemon__instance('sdfembs3-lsstcam-s3nd').with(
+      image: 'ghcr.io/lsst-dm/s3nd:sha-1a94702',
+      env: {
+        'S3ND_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
+        'S3ND_PORT' => 15_581,
+        'S3ND_HOST' => '',
+        'S3ND_UPLOAD_TIMEOUT' => '10s',
+        'S3ND_QUEUE_TIMEOUT' => '30s',
+        'S3ND_UPLOAD_MAX_PARALLEL' => '25',
+        'S3ND_UPLOAD_TRIES' => '5',
+        'S3ND_UPLOAD_PARTSIZE' => '50Mi',  # larger than test file size
+        'S3ND_UPLOAD_BWLIMIT' => '160Mi',
       }
     )
   end