Skip to content

Commit 13b166b

Browse files
authored
Merge pull request #1827 from lsst-it/IT-6361/cp-rotate-lsstcam-s3-creds
(site/cp/cluster/auxtel-ccs) change s3 endpoint s3dfrgw -> sdfembs3
2 parents 7452af1 + 8fbaadd commit 13b166b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ s3daemon::instances:
1010
env:
1111
S3ND_ENDPOINT_URL: "https://s3.cp.lsst.org"
1212
S3ND_PORT: 15571
13-
s3dfrgw-latiss:
13+
sdfembs3-latiss:
1414
image: "%{alias('s3daemon_default_image')}"
1515
env:
16-
S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
16+
S3_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
1717
S3DAEMON_PORT: 15580
18-
s3dfrgw-latiss-s3nd:
18+
sdfembs3-latiss-s3nd:
1919
image: "%{alias('s3nd_default_image')}"
2020
env:
21-
S3ND_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
21+
S3ND_ENDPOINT_URL: "https://sdfembs3.sdf.slac.stanford.edu"
2222
S3ND_PORT: 15581

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ s3daemon::instances:
66
cp-latiss-s3nd:
77
aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
88
aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
9-
s3dfrgw-latiss:
9+
sdfembs3-latiss:
1010
aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
1111
aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"
12-
s3dfrgw-latiss-s3nd:
12+
sdfembs3-latiss-s3nd:
1313
aws_access_key_id: "%{alias('s3daemon_test::aws_access_key_id')}"
1414
aws_secret_access_key: "%{alias('s3daemon_test::aws_secret_access_key')}"

spec/hosts/nodes/auxtel-dc01.cp.lsst.org_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@
5656
end
5757

5858
it do
59-
is_expected.to contain_s3daemon__instance('s3dfrgw-latiss').with(
59+
is_expected.to contain_s3daemon__instance('sdfembs3-latiss').with(
6060
image: 'ghcr.io/lsst-dm/s3daemon:sha-57e1aa9',
6161
volumes: [
6262
'/data:/data',
6363
'/home:/home',
6464
],
6565
env: {
66-
'S3_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
66+
'S3_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
6767
'S3DAEMON_PORT' => 15_580,
6868
}
6969
)
7070
end
7171

7272
it do
73-
is_expected.to contain_s3daemon__instance('s3dfrgw-latiss-s3nd').with(
73+
is_expected.to contain_s3daemon__instance('sdfembs3-latiss-s3nd').with(
7474
image: 'ghcr.io/lsst-dm/s3nd:1.6.0',
7575
volumes: [
7676
'/data:/data',
7777
'/home:/home',
7878
],
7979
env: {
80-
'S3ND_ENDPOINT_URL' => 'https://s3dfrgw.slac.stanford.edu',
80+
'S3ND_ENDPOINT_URL' => 'https://sdfembs3.sdf.slac.stanford.edu',
8181
'S3ND_PORT' => 15_581,
8282
}
8383
)

0 commit comments

Comments
 (0)