Switch log uploads to S3

Author: mnasiadka

playbooks/base/post-logs.yaml

@@ -3,8 +3,9 @@
   gather_facts: False
   roles:
     - generate-zuul-manifest
-    - role: upload-logs-swift
-      zuul_log_cloud_config: "{{ lookup('ansible.builtin.vars', 'zuul_cloud_smslab') }}"
-      zuul_log_container: zuul_stackhpc
-      zuul_log_delete_after: "{{ '30d' | community.general.to_seconds }}"
-      zuul_log_partition: true
+    - role: upload-logs-s3
+      zuul_log_bucket: "zuul-stackhpc"
+      zuul_log_aws_access_key: "{{ zuul_s3.access_key }}"
+      zuul_log_aws_secret_key: "{{ zuul_s3.secret_key }}"
+      upload_logs_s3_endpoint: "https://api.sms-lab.cloud:6780"
+      

zuul.d/secrets.yaml

@@ -1,32 +1,26 @@
+---
 - secret:
-  name: zuul_cloud_smslab
-  data:
-    clouds:
-      auth:
-        auth_url: https://api.sms-lab.cloud:5000
-        application_credential_id: !encrypted/pkcs1-oaep
-          - mdpTMVQsfcrWCdTOh3LAA4x4mNDOruFwpm9HK3lThUtNpCg2gUyrXIJ51CElIsMGxOgyb
-            iinplLg7Ta12KljyYVDsvpDRDTc+H86XZ5hBPs5WL67W/wnK7XTjcbsrz6WWbcGA3WxWi
-            CukWiiasf/0TVxK69u+UrkTNJW2/dnw/JFJJ6F90SiCJNV+avAJ/o1ItfBAaPBu/2Bdlw
-            cMxl+1DykqSRIWjVymqfp2L+piabR8TmyE1xM7fzbU/jyl8sjgPM1iz9r2C69vNTFcTkG
-            TilcAapPVkZDXPyU/U7VIQhweWx7O1JQf5wGKYKlbSuyejpiRH8NAekS2Idn7stetpq5x
-            hOkGoBL6w+r3OZZ//ECHwFRyf5IaHbzhylZ09SsiP+4J2PhRZ0r7H/N/N72KGLUwA19zl
-            ONvV1SNsC2oUWfYVnGPkHXNsh5GGnWJ5miFvYVCVeTMIUIc1GSm78tU67+xr7GXOeNyK7
-            06barTc1I3ux5Ahn2dZJEdiPWus4wK6gn+i2DnwCE60lOHuukxdQ7Gf67FYdhLTIMh4XZ
-            sJhe3YyNUbINZgX8TcGW9/t1ySJ5e77qEoTDJ8auPcK0OOUH2iBNlTSN/r65ntthnE6/q
-            Hx3fgVmHPBsWFn3t2N2sSbNxFgjZGR7A7GDmDMC7T0urMAQOoXvk2knxqrjBjo=
-        application_credential_secret: !encrypted/pkcs1-oaep
-          - Wkc61PkAHAvl0chguVHaPDh+xO9E9l6VkA+bCRg2dPxJGChPzNvwmuwb4yt8MqowvaFEl
-            aYKXo44lxhc19PWTeb8gFR8WTtSiAhsc93EiUaJk5Vzh0y3zaf2CtVIo/nZNhEBAXBAKx
-            6IPA9QP5gNdGZRaJnWvDsiFGDNrZh/rYXHvzHmdQU0g9komxUKqJZoN4zZdOL2xUvPt0v
-            1ygksNvk3I6GbHqYepSckVXTXooEidvx/xrwHYsii7e2LHJJpJeP+TrC8Tqzp766P+zon
-            reQOd/OL2tObnO2YOo8lOkA/R2O4P57WjlpD0K9gE+LvCedQooKDsuaszr38cIq39PXu0
-            tPORJmiKM4QaZVaLQ2pcfSP8W8vAyVtNybpDhSscx6CGS+AjtFZz/4EO1DMJfntNQrHaV
-            sJX4mqb2my6T7hKw6crgvywWNhtjRda70dNJil6/hbxeCq5yxm20Rx9GSGrMSr8vEQzXn
-            ktDz2jh2odJQ5iHZTughupPUcOSOqSV6gY33HdlKwRBNgZeiA/sK7CE6W0WzqIzQwseYo
-            XDViwDwE9uK78IwejMpXO9/+0gsVhzLhOpaRtWX7pGmN+6dXs0IFlTWzF1dGLwZ2Euqzy
-            a9EoxjitT1UrZr5CPcxvaf5GYk5nrmXNyP78PZf0c8yPVfVM6vyaSudqUO9ftU=
-        region_name: "RegionOne"
-        interface: "public"
-        identity_api_version: 3
-        auth_type: "v3applicationcredential"
+    name: zuul_s3
+    data:
+      access_key: !encrypted/pkcs1-oaep
+        - DUJXvUUC52iiIn1PQ0UT6vCZXefhgst88LmT9Nz9L6s7hEoUgbgt7EgqJFYUVYUJjQSUa
+          IHc6EEeUS3sQGKIMRdYoQi2asDdi16N9h4nV6So32L7RIRm97ETC3OuBzLlZezK1f7y9x
+          FRQuzA73Ff0xK6MLG/Ls6Bw/zxiJRYrCdbA5hdAaKyBxN92tZhaEXC/a2YHhyCNcKbMdK
+          SLJlUYI0t/UOkcULfqbjCu1fJbW/9H7m/OJ1LJQM3p4QNH8V5NAQuQsnTBG6oHflQuHqk
+          XZtVXSY5cDyb07a1U/+JeqmA+ZTwJFR02n5cqBeDK7WJJLVARjHOj633YoMsO2TlHGbLH
+          z7ExUs+L40VQ3ObD1KxdAqRMbJJEvefOJC6sGy+96i+gDRkuov4TDq0bBcrOyVZKMevtk
+          G2cLbd+zQDNtm7+p6BteoX4oESlezc6vuRUrC3JgeJ1MjB8I5EWRp7u4z3uDRmW1tgdu7
+          ZRBzon/ZgO8R4v3thuO1mNvTzPU96CE8u1Rglvh3P5VUSukUbzT09k7UgB+gWxzg/ZdXD
+          0C+j+HJPnuzSI16TMAt1ewUr1l79eD5DKAYg4yhNU7+Qsib73g7sydObzxAugI32mCqFO
+          htaBX+yERF2kJg4bqt4n3McwJXSrdHduM5BxBx+8bHDRLvrb7CHUkXPNnTDrfQ=
+      secret_key: !encrypted/pkcs1-oaep
+        - pB+mas3xIYRsjgP9txALUJJkbsqMtmJweDuMx6SlhBCWP94kTn1npU8kRZruQmFvqsir2
+          GJKGNUuO0DY746/4104JgFTTch0e5ZK83QGgsNk+XF+gbXnwyQYgdUYRQ2PTVdBdX1/pw
+          z8emqb/6Rp4KZKuHlOwHw9LekwW8FWzAp65hUCkw1Ynsimw0W+/KfGJj47bZqdTWmPm3i
+          4z3C2CYmuJi4iigerxITsu/WQXEbNmHBOWMs0assoltduTuNiI+2pwaZ4fCMiDVXJSS6A
+          mh+PlN42vON/lJ8LMpTlGxAioHTypqEjxOha6dYNVMqJfw+pzy4WG5f0YaHZdRMlzIUym
+          V/3OzOaTDBIiqJPM9K0V3tr9P/vzoNAzO80tErjMe+Msn6QYVR8Pc69/FhyFniTZFJpXj
+          s6B4PPwAQU/T0MR9hTXkLhQ93aw4/teOimbwSt7CPZdWuo+hKuGpjLA7BOPO2rz+9itGe
+          ZDMxEp8jjBZhapFhOb0NBTXd3L35v7PGcCFqSdWRFsk3K6VIIsylMlWUVnau6cizEWgZ8
+          tmRVuK37nm7oEgbAr3YoXFxlnuP13h3jheRF3K0ukzcT8JN17ZDFnjv+eIjeH8hPaMHoc
+          PZxwPIWgGkMEEJma6jweRDOp9Qa7Zd9QGUDagGPKeNfxspii8FeHKKuPI8WL68=