From b98a607a1a0ca8b00d1cc9bc8e9da6f61e0f74c6 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 26 Nov 2024 13:09:20 -0500
Subject: [PATCH 1/6] Update codfw1dev creds

Bug: T380900
---
 tofu/secrets.tf | Bin 317 -> 317 bytes
 tofu/vars.tf    |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofu/secrets.tf b/tofu/secrets.tf
index 64c29284d8268297fc358e73aeae45ea698cb7a9..9854ffc483751b8d4ed879850bfdf310fe250536 100644
GIT binary patch
literal 317
zcmV-D0mA+OM@dveQdv+`0G(_;$;?+Kq@HM);w(?d?QW6E1m$_t?(u`H7<n(D6}Yl|
zEHy|Yz<YV7D2&4o4Wz+Kjw`f`;U2<HgC61)s!;GQOqTOfs82J-uI;;^a@Z~~*?<%S
zs}{+_vUvKFSa2RrJ_suRJIKjIEWI5Px@xlFeRyK)x&65ztex06WO>*VktY}wd%cmH
zd;gKQuf(+zNgdT#bO1HXU&L>rH<;NyTRQIyy3WezB46G$@81lw!8`4^j0tLYcQGew
zx)QH<oIrI*J3hs4hi?!IL^1(IC)l1Yhx1>5w~4S<(+|<p{+XrzlW{cbxmAy|y-%-{
zq60(?%Suqcx+iZ<E1n9iFn6v4B9w2vA<cp4d6Vk}((0RK{IYuZJJI9;lv6M6tqiPZ
PSEjbSVj;1D9uxM?=e(O&

literal 317
zcmV-D0mA+OM@dveQdv+`0A#6uoDQB+x+SK+F@jTj0uF=F0vF`TNQ)$kyCL@5EqR{a
z-#f+qs_V3D+^XB5<srUEs}#XMfk)M-$q7s;CsBt7+#gRqc3==3$8gv<uT;4f!oSfZ
zop}S_22x*$JiwO;Zzu&tXXCZvGIC?Kclr5)nKTKbo1v-5rh8hF_fs8X4#lQ${-$F2
zr$G-Co)@oB4)wRA61N*-!0!4;tE)omHCC;*Ww%zXs{^s?k2n^&Uh^f1)(H4aY9ef%
zymnX9#BZ%KyXp~HES9+C6r31zIdnNr@POY74ys;|ipX@3UwE0<dqx}QgU%pa0L3U0
zyOirIk|Qc=L>u1)X_UYFYuQUkvzJ<r8<T~kiXHgwf&t;RzKx+@>BIg{4yAf||2dAj
P^wk~VuLnL3URJ<<l?0kh

diff --git a/tofu/vars.tf b/tofu/vars.tf
index 23b1f771..45b57a5c 100644
--- a/tofu/vars.tf
+++ b/tofu/vars.tf
@@ -29,7 +29,7 @@ variable "tenant_id" {
 variable "application_credential_id" {
   type = map(any)
   default = {
-    "codfw1dev" = "ef08f1e29861499d94617f6e116c264f"
+    "codfw1dev" = "6b404a11241446c7a52c04f39983eda6"
     "eqiad1"    = "43edf67449c740538af78c1743cb72c3"
   }
 }

From 15a286692e1aa2ee2d5255017bce99285f7b28d5 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 26 Nov 2024 13:14:05 -0500
Subject: [PATCH 2/6] use_path_style

---
 tofu/codfw1dev-backend.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofu/codfw1dev-backend.conf b/tofu/codfw1dev-backend.conf
index 8950ca58..1b463dad 100644
--- a/tofu/codfw1dev-backend.conf
+++ b/tofu/codfw1dev-backend.conf
@@ -8,4 +8,4 @@ key      = "state/main"
 
 skip_region_validation      = true
 skip_credentials_validation = true
-force_path_style            = true
+use_path_style            = true

From 8bf5546b3a4aa81daf2cb5daa62454e14d819868 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 26 Nov 2024 13:15:00 -0500
Subject: [PATCH 3/6] id

---
 tofu/codfw1dev-backend.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofu/codfw1dev-backend.conf b/tofu/codfw1dev-backend.conf
index 1b463dad..1c18f0fe 100644
--- a/tofu/codfw1dev-backend.conf
+++ b/tofu/codfw1dev-backend.conf
@@ -1,7 +1,7 @@
 # https://github.com/hashicorp/terraform/issues/13022
 
 region   = "codfw1dev"
-bucket   = "pawsdev:tofu-state"
+bucket   = "d34805fb49a44a82a0b9668ad1d1227a:tofu-state"
 endpoint = "https://object.codfw1dev.wikimediacloud.org"
 key      = "state/main"
 

From f347c642d789d55c81ef7a549cd8923728567f02 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 26 Nov 2024 14:17:54 -0500
Subject: [PATCH 4/6] spacing

---
 tofu/codfw1dev-backend.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofu/codfw1dev-backend.conf b/tofu/codfw1dev-backend.conf
index 1c18f0fe..7ab6c18c 100644
--- a/tofu/codfw1dev-backend.conf
+++ b/tofu/codfw1dev-backend.conf
@@ -8,4 +8,4 @@ key      = "state/main"
 
 skip_region_validation      = true
 skip_credentials_validation = true
-use_path_style            = true
+use_path_style              = true

From cd60a268e128871bd26db4934b9b616cb8c6fcb7 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 26 Nov 2024 14:31:14 -0500
Subject: [PATCH 5/6] ec2 cred

---
 secrets-codfw1dev.sh | Bin 327 -> 327 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/secrets-codfw1dev.sh b/secrets-codfw1dev.sh
index b7b292624b5306e28dffa48406d28ffac7517277..9b4b016a65c7b5827cb66e51321a92a9dee7f257 100644
GIT binary patch
literal 327
zcmV-N0l5AEM@dveQdv+`0Ow-O&xb~A;%o!#A3m}`Q#a}hjdoSywW56lOxw-)473e}
z)ksK+B<rV`z0RFktZuv8-!L3&EL4p7ym7*y(E$KcY=e+9l;{}`#@CD&@bn3^x|Hv^
zcPIMB$F-%=Stceg(Y;#~hapm@>sO951+TBplQOrrt1V`4P1l9}SEpre01$(=c#%h6
zB>xA*nu3S@=vKos#N}w*B;ptiZfFN4HdNNC*c7KPQ)CdV+(+QuHQ+%B1Dy4cs{E-8
zW}k_6b^OY<U8?lexAPRCl<;t0KMV$o(0%ve);>@(n(Jto(M_BscHBd*80+w7{n4#-
z>)`HWto{UMlk5@G^A`b3#XG0&48%Of9Hu@}<Eu$H=tocZnso1hJM9Tgu48v8palh`
Z{r41LF4ZZ4sGo8AR4L51EpihoRan4yrECBI

literal 327
zcmV-N0l5AEM@dveQdv+`0M+*wUI&ZJQ<+3s%^&;bH~dVxY_`0y&PeNRayArid3F!f
z2n5(CMCupF$M;do@9~s<Cvsi8207$Mt)~G#5uN&FEEbH~Q7LmcoOm^+Ekuk*xVS6W
zOgHWOs;>S1_8olF<A*Y0W(5&x8D8nn*0`;z`sl@P+%gjQ&UzIYpWd1fSJ7S+8?MW!
zVBc+&jkQ?2D+8VJtK#~TGs5b_Onr3+gyIVQTIUAuvfy0=pr>x{Kg9Fvn^!YHhZ3pG
z<sRYWHG6T%I%19-QW?@(y2%;;^#laH6{m%;*L-CevPBi%*-%8`QbccKD#MHq5>p=4
z=0H2K<sGeJ>Gxr5z?su~_;+4YTO);kV|9f@p6i4HqzOzV+t^D$9Vg}o7@<o)A#LOf
Z+iQ0J$gzN9(DbhROl6n9Uvnv#QXB(*qY(fA


From 8c6592e4631d6b4b70a7f224cbdbe2f8f9642e9b Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Wed, 27 Nov 2024 11:03:45 -0500
Subject: [PATCH 6/6] cinder cred

---
 ...csi-secret-cinderplugin.yaml.codfw1dev.crypt | Bin 646 -> 646 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/ansible/files/csi-secret-cinderplugin.yaml.codfw1dev.crypt b/ansible/files/csi-secret-cinderplugin.yaml.codfw1dev.crypt
index 9882c95ca24d03be6322cbedda7ba8dd41271f05..6870f359aafd599067ea0df585fb9df457f9d45c 100644
GIT binary patch
literal 646
zcmV;10(t!aM@dveQdv+`03EkRB65%QFWu$qVtskFpeMpA8T9E{Ov9L`BgCivP!D)J
znwCROj*PW@<JB;vu-cDqce&P+3L$U>n=heb@VS88`96AQk5R$(-RGUa`;hv2ow#Kw
zEN*E8)`)y*F5OxMvf3j@`ZeUY<goPS(5ROiYyi9st0udKvm@5~%u?}5L!ID53HG)+
zt~K3O^?RT}br$tp&}gYHpY(SiGPSMGF>1uoAYF;p%?K}@ggmN21$@iYSA6=L^ILOX
zFjrhc`L5BwHbjI$ql#n`R)JE}X`A^GF^U+Ak4MrfVt!dY<@(VNXAE`GMfIsJ7I`C*
zsdujEB4sdwR8?PJlxe*No(VA$_guU2%9lE!KJ%~0W$9#usfyf0fC57^Q0<AH{2~e@
z00YT}<p^1FTd+&@`q%RaL%jCi##2*pgeDBQI(V4JA|0gM*fS+~hw-xbP(09xc%4Ot
z_p*103*cH19B;d<4{xG;KC9Hw0>c8<D4)4rnMH+v5axb#rLd<nc-u0y`DKarZR1(b
zz>MrhW+LB(7P)v~^3#9zj>XC>ygL>To21nn)Bq^xu!hsW`2w5V%R*IaL+>=`d)TQH
zQ`-~kCBY_HXmd(WGNO`e=ulL&q*GwX!lLq@%oT$)-C(JrKim+khjHtI-_o+Gv@aHT
zgFl5WQR!;Z#|_^!MKnRLb>-_F@)~@Bb~}^rAN-n2LiVcFuQ^-Ze|$qHeY<(kN7C<y
zm3EPsypG3nM_NIRPY?uLV5Ph}tg5%Uup|E^aDb+1a2-AFk&3-P2x7xMYgz_)nrTq^
g1H4NU8x3i?L>g55jb6`3h^Ik@L6CFcWJEjouE4xTh5!Hn

literal 646
zcmV;10(t!aM@dveQdv+`0B!`cIf?53VBU{%8#O2436L#o^`}X>RY_8yI)-w#!kNq9
z5~HGSwAX5`qx`qo?OIjR2d_&YX6p{EH7fFoh^2s8byoT7h~P|ES~}hx@PWFu>0kcm
zm4^&_a}m0;RXcSaLp>Py{zvsFT*n2hK2XE^43U^fe{x?Ie5|siuvL~b2@H)<&6O7@
zj;Me+l1cY(f-;MSMgsWuOWR2t1|F~lw28i(Fku8EZg9I=u2TPllsZ=tDkkQnIC}Nj
zVf0}Y7?CjXY&nyfB=^p10!GA@g^(INFgCR4O&3^a;=Db1`FwRiSPq};kyH`zO*9LC
zf9s3TA;HSEUrgkF#6XP%?0dKMUyHmsU+&S;GP#l(yLpo(bOB%W-_;xqzrz>i`D(WG
zf0<jcBf#HV;a<^A1#g;6uw|wTu$4-#N*vS8=5Il(o^ky~pS6(GyY)w|w=Q#K`iTJ`
zBgL!HY$JA>(ZL1j`~8b}blfNTWT=_DIt6D8*tEFP3>7wO&OdHFXDe3IDjBi|qrxSH
z@si6QCD_QRC-6H)0h7p*>-@6>Kt`h;xAq%B&6s4jd%|%d@-rJN!6Rroqts<6pa6<g
zVZ=<-*XX0<MDDgZH|_vUQ0w^kjN<AjOHbi1<!Gp5{~FB$wTydGwvx>%TsI&r2Bm9*
zE)2u-)JgiZpIe*aGAa?@GAis_Kd#8<GKc^N-!>ZXbc!qJka{b$S;`TvBjh?q&!8%S
zG0!Xfr15+4QKjWnkx$mp`_vu)NX(+agMD}ddMSD;l=}}iawg8sSSkd=rS7n}nG|NF
g<kNFhW3^c2Alm-z@YbO61eR1v0d0W^9v^Yha$u4{MF0Q*