Revert "Move out S3 vars to secret"

This reverts commit 51b7e2b.

Author: mnasiadka

playbooks/base/post-logs.yaml

@@ -7,7 +7,7 @@
     - include_role:
         name: upload-logs-s3
       vars:
-        zuul_log_bucket: "{{ zuul_s3.bucket }}"
-        zuul_log_aws_access_key: "{{ zuul_s3.access_key }}"
-        zuul_log_aws_secret_key: "{{ zuul_s3.secret_key }}"
-        upload_logs_s3_endpoint: "{{ zuul_s3.endpoint }}"
+        zuul_log_bucket: "stackhpc-zuul"
+        zuul_log_aws_access_key: "{{ zuul_s3.access_key | trim }}"
+        zuul_log_aws_secret_key: "{{ zuul_s3.secret_key | trim }}"
+        upload_logs_s3_endpoint: "https://api.sms-lab.cloud:6780"

zuul.d/secrets.yaml

@@ -13,8 +13,6 @@
           Vn3iJ7rgSD18Y8B6nc1x5yR5X1f/yZjbxPKZMO4ZydoXXb18dfrN0s50RWDQkjoS6NVq5
           HGRkqhBQNv0Q/7D/yGmq3H48CKFXZhuzMx5rmONBOgfB+Ae1b5wz2gOhqFOY20PZxOyS6
           s1Gs3WpLE2NyaZdq60HW2YCq0JJN5Uu2ebRZ3A5uj+csFl7h7heCtGz0HUjpWo=
-      bucket: "stackhpc-zuul"
-      endpoint: "https://api.sms-lab.cloud:6780"
       secret_key: !encrypted/pkcs1-oaep
         - ognDJejQHLJcBHBUE7HAvK53ShQB3OnCdBjYHLWdNKIkgVb6qdLnXujj4jSgmQPRPXR+/
           7Cqu6v89I/1xIKDmzf81Tu6/qp13K8u8YR3QjOED+q4et0VmWGhQXzBJV4GbCi7r0kvzB