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

Author: jhoblitt

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

@@ -5,8 +5,18 @@ s3daemon::instances:
     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
   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"
+      S3ND_PORT: 15581

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

@@ -3,6 +3,12 @@ s3daemon::instances:
   cp-latiss:
     aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
     aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
+  cp-latiss-s3nd:
+    aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
+    aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
   s3dfrgw-latiss:
     aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
     aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
+  s3dfrgw-latiss-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/auxtel-dc01.cp.lsst.org_spec.rb

@@ -27,6 +27,46 @@
 
       it { is_expected.to compile.with_all_deps }
 
+      it do
+        is_expected.to contain_s3daemon__instance('cp-latiss').with(
+          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('cp-latiss-s3nd').with(
+          image: 'ghcr.io/lsst-dm/s3nd:sha-1a94702',
+          env: {
+            'S3ND_ENDPOINT_URL' => 'https://s3.cp.lsst.org',
+            'S3ND_PORT' => 15_571,
+          }
+        )
+      end
+
+      it do
+        is_expected.to contain_s3daemon__instance('s3dfrgw-latiss').with(
+          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
+          env: {
+            'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
+            'S3DAEMON_PORT' => 15_580,
+          }
+        )
+      end
+
+      it do
+        is_expected.to contain_s3daemon__instance('s3dfrgw-latiss-s3nd').with(
+          image: 'ghcr.io/lsst-dm/s3nd:sha-1a94702',
+          env: {
+            'S3ND_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
+            'S3ND_PORT' => 15_581,
+          }
+        )
+      end
+
       include_examples 'baremetal'
       include_context 'with nm interface'
       it { is_expected.to have_nm__connection_resource_count(2) }
@@ -49,26 +89,6 @@
         it_behaves_like 'nm ethernet interface'
       end
 
-      it do
-        is_expected.to contain_s3daemon__instance('cp-latiss').with(
-          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(
-          image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
-          env: {
-            'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
-            'S3DAEMON_PORT' => 15_580,
-          }
-        )
-      end
-
       it do
         is_expected.to contain_nfs__client__mount('/data').with(
           share: 'data',