nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve OpenStack v3 compatibility (#7392) 

* Update paperclip.rb

* Update .env.production.sample

* Update paperclip.rb
This commit is contained in:
Hugo Gameiro 2018-05-07 01:28:28 +01:00 committed by Eugen Rochko
parent 95595ccd21
commit ea4e243303
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production.sample
View File

@ -113,6 +113,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
# For Keystone V3, the value for SWIFT_TENANT should be the project name # For Keystone V3, the value for SWIFT_TENANT should be the project name
# SWIFT_TENANT= # SWIFT_TENANT=
# SWIFT_PASSWORD= # 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 # Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
# issues with token rate-limiting during high load. # issues with token rate-limiting during high load.
# SWIFT_AUTH_URL= # SWIFT_AUTH_URL=

1
config/initializers/paperclip.rb
View File

@ -60,6 +60,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
fog_credentials: { fog_credentials: {
provider: 'OpenStack', provider: 'OpenStack',
openstack_username: ENV['SWIFT_USERNAME'], openstack_username: ENV['SWIFT_USERNAME'],
openstack_project_id: ENV['SWIFT_PROJECT_ID'],
openstack_project_name: ENV['SWIFT_TENANT'], openstack_project_name: ENV['SWIFT_TENANT'],
openstack_tenant: ENV['SWIFT_TENANT'], # Some OpenStack-v2 ignores project_name but needs tenant openstack_tenant: ENV['SWIFT_TENANT'], # Some OpenStack-v2 ignores project_name but needs tenant
openstack_api_key: ENV['SWIFT_PASSWORD'], openstack_api_key: ENV['SWIFT_PASSWORD'],