From e8af18c387782ef548a6451704f36f7005d3684c Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Mon, 3 Mar 2025 10:38:53 -0800
Subject: [PATCH] Switch to new rax flex project for image uploads

This new application credential is in our new project, and so is
the new swift container.

Also, move more information into the secret so everything is
self-contained so it's easy for us to add more locations later.

Drop the user_domain_name because that does not seem to be necessary
with application credentials.

Change-Id: I1bf4a616777a594dffadf4016692446b23ab2976
---
 .../post-inner.yaml                           | 10 +---
 zuul.d/secrets.yaml                           | 49 ++++++++++---------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/playbooks/opendev-build-diskimage-base/post-inner.yaml b/playbooks/opendev-build-diskimage-base/post-inner.yaml
index 52a4929..7ff548a 100644
--- a/playbooks/opendev-build-diskimage-base/post-inner.yaml
+++ b/playbooks/opendev-build-diskimage-base/post-inner.yaml
@@ -14,14 +14,8 @@
   include_role:
     name: image-upload-swift
   vars:
-    cloud:
-      auth_type: 'v3applicationcredential'
-      auth:
-        auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
-        application_credential_id: '{{ image_upload_secret.application_credential_id }}'
-        application_credential_secret: '{{ image_upload_secret.application_credential_secret }}'
-        user_domain_name: rackspace_cloud_domain
-    container: images-1f49951f5beb
+    cloud: '{{ image_upload_secret.cloud }}'
+    container: '{{ image_upload_secret.container }}'
     filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name }}.{{ upload_image_extension }}'
     name: '{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_extension }}'
     delete_after: 259200
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index d83f5cc..17300fd 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -1,25 +1,30 @@
 - secret:
     name: image-upload-secret
     data:
-      application_credential_id: !encrypted/pkcs1-oaep
-        - bICM8SzvLnrFfa/fhCSVYhxrgysEQDL1UZNPxYilK2eqad7+heFoGV/eU6M2C1AT1uBfM
-          N0IdfXjIAmzk0TMZGLmRTAFLx08VcQp77+ny6DSi6WvQd1aVeTMl48/LCpmU8qcxy5wvE
-          lGVen39vNpUuPkNaHOAypRAHIwXs6nGGNMILOQ3nKlCosaNmnB3Ixzu0fxPdSoDiYhRb5
-          7555UzhwNNr81gMD2b0idGcWEfL9A/DIxEljsEhUgV95JPeOs+PTlAVZXNSLiZsOJyGHp
-          +vZNCvg7Pnk7PFUSkWcpE4hKcmx8C55bESfWlLYr1z24PILXntLoFvfAvTldx1Q8yIRsQ
-          ifwtmMSiNvIsx8hse0scQ2pAQNtN0WRBRrWbU0NlSkDO4x07KrVxpE6fX+Qi9nRmKRAkX
-          uyszGJVjsLB+Lxo5kdxXHZRlkeYix8LcZaJdr5vMJlDrdN1WbtNEF9DB3oT0VB7Va4Vpa
-          9FvQ6Z8IH6xp/jwnt/2DUEYJ1pjgqXuV7TMo3w1qfUTkGxjiJCVQe6nN7JMZfq6gXrXhV
-          u8k4bMUc5O5Pm54yxfbGfBUWhokk5WpdnxY9J2ruDnxUshUJYVlUCe4yLo3ARe3vCeE50
-          SQ1iDZ9ubl69ehZv/Ok1kgYXxgPqQP0uFQQgUwG1ePrPIE+U0haFDXphrjrOiM=
-      application_credential_secret: !encrypted/pkcs1-oaep
-        - s5mHiz8S+jT0PuFNd2567PTn9Mypo/pnkgEBIRj3czZCtfOprvT/atyFcKExYI+NU6/1P
-          tv6XgjeItKyH0Iof6PiGLZyQf/BMekPCu7YG+fkKGjoWX6cxl/ZNYwPXuhI8tfrClCKMR
-          FOueVRbqjJrliAfAi6PID5XBiuEX4r+F+EmezipeuT05Mw+4R0HY8dLwu9lxmvrHVIA2t
-          GeHiNc1aP9jLa8Pp1suNPHAedZvyBPLajI0jhNffBfo96cPR276JpccJsSQkbh/7nVATk
-          hzaha1z+rjU2bWaTHsuqk3M6MGKU4M06siynwhlHjWAGzh1CDEc/CHwA1hHeiK3nuA0By
-          1la55jH/5GPGi0e/2wmaZNpm/UMZsbFvOr9zCq0eb0Op0d1kZSD0fFcn0ixrYY+4XZ2CL
-          IjD1P05mmi2VbIvCY8fbyX/+ucUzM/P1B9XWdyhlQgF1cLnRQ27r2oa82m0aRbTms0x38
-          +XLe7q4bKdDJI7YR/FwKzP+93KkmXJA05pzU8N7ojZ72MtykuQgxv/3SRL85po6J+58M3
-          JHyovg7/PHIwyRM/j9Mm/+o5yu6GWwYr44lgQP1KoRz+YEa7XuEy9NI4bRtNRPixlJrwP
-          7LunKyaRoe1aX7pc1C3/onhCsoSWbPQGW9hpzrtLLVChobphxy9ESam6Lcsr9k=
+      container: images-7b7d44d25aa9
+      cloud:
+        auth_type: 'v3applicationcredential'
+        auth:
+          auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
+          application_credential_id: !encrypted/pkcs1-oaep
+            - H5YNXkaJ8o4n7zVFSEXSoeKrD1+BzAU3/QBqXCY2EuoxBlJ+C1PKd6wK4DCaM9T107qO/
+              7mFXIun6HyDvjxto4CeR3S10JjiXARPnp0WL38M7fxFYIUj4/ej96UnVd8OtAjshhVqJw
+              CZb/U2otJjaPvWhFz1kSfWhZb+vnls8qWUUvU0xil9zJR/899e9xjkMR8wxmtmd2KuE32
+              Uvp2VUw48w25xZ7x+7yKtMyqX0YIRANvRltIdacMfVMODSmgeBDlKidzUU4BOovulOUVc
+              KCC67EZjqLXpqxljKYB9swcato0GqEvVQAMtOlYdzXLV7LbF+rbC+wDp+JQmfU4rJPN3n
+              yfAqnwCn2NwuvVFnAL5RSraiVpagxZ1zLZDa7/hzcB0go3T1KImZLWcWIQeUgoZITKYPD
+              YVyvoNVPpgJXVkpzy6lHDiSkOo6o61hggbCgrO7JkxQKdixSkHrDY08M0nv1XZJ/ZP1Pe
+              JdojUUIRuwoiwB+SRD18P53uDzH7gcWIsho/z5HXmrScO1gSIb5lqEd9TUi8wWTeCLGRq
+              lwNS+D0fmLbTU/zaz8dZ2rWGO60TOqUSVEsKL9dEsP2AiqMfcO226UcqEmZRu6uOw9GzL
+              Su4jjCN7DD1z7LfdcEfYJ5pKfRyp/aQ4KbsikvFUHRAUqwIw4DxGszJbbf/TDk=
+          application_credential_secret: !encrypted/pkcs1-oaep
+            - gZCl/H+zXZI0KDxPyso93IYdLl413hmkEE86A1CoRVXD6b1LkKtZmMEzAcRDDVxhWCWl7
+              asnCGGnhpyK+g9tqe6z2VMXkN2fz00NIVEElvfO5/yCEk+i6hyI+GSITNvaLGhxM6tvh+
+              LDZAmdUgDvap8j0BRhb0Zt1H4X+isKB//YxtqQ7+hLe756nKIIpDqIKRm2R/I8IzAagRM
+              37Yb0Lp5Bs+1cgYIHABx/4+8tjWe2ZTRXL9+2hZhp6aXezulK3pH5bA7FKtiWd0l4lDuN
+              Gvw6SzuP7KAwfwTgDOLTB9x8N4eIwXVB35M0nU6bVTx9gwQyEHpOvL7ZkLMs/CtoKQk/r
+              3O0eS2LVXAb+moddIOQq/0VgSGw/cByJdOaANk8OglC7mpcNgwYM0nRgkRRi9Oxypb9TL
+              1hrM7Kq7HZmvz+AI83iFlUSXxy1UFtN8rYoY26yueiXTgc9CGB309YWuCyHt4NmteiO2C
+              UnXrMwpD2ia/IZm9cbqJexKZgEKGx5Nf+6uhY0ksN+UY+OoIjJqZZk1jt3irrsh/HlQ9n
+              8A6kOIRg0TEcAgOU2XuNQL84ZYwBMm5VptJoweLzrTtCcJuhBNJ4p+A1d2BuaEc+6Ikgr
+              Fc4z0IOOqyBQ+Ls975TPQ4YMPaZBMcXYFXOLElFOu+R9vpIiDOExvUss7LATGg=