Improve OpenStack v3 compatibility (#7392)

* Update paperclip.rb

* Update .env.production.sample

* Update paperclip.rb

diff --git a/.env.production.sample b/.env.production.sample
index c936546da835b90f6c729506a3119841600b09ff..24b6b01439bc588c79efc34d9cc423b209d964a7 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -113,6 +113,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # For Keystone V3, the value for SWIFT_TENANT should be the project name
 # SWIFT_TENANT=
 # SWIFT_PASSWORD=
+# Some OpenStack V3 providers require PROJECT_ID (optional)
+# SWIFT_PROJECT_ID=
 # Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
 # issues with token rate-limiting during high load.
 # SWIFT_AUTH_URL=

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 17a520aa20cef1d38b75e3c6b5cc933b09cb1539..c134bc5b8feb00e29a1044d9423a8edfd4d25c23 100644 (file)
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -60,6 +60,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
     fog_credentials: {
       provider: 'OpenStack',
       openstack_username: ENV['SWIFT_USERNAME'],
+      openstack_project_id: ENV['SWIFT_PROJECT_ID'],
       openstack_project_name: ENV['SWIFT_TENANT'],
       openstack_tenant: ENV['SWIFT_TENANT'], # Some OpenStack-v2 ignores project_name but needs tenant
       openstack_api_key: ENV['SWIFT_PASSWORD'],