diff options
| author | Hugo Gameiro <hmgameiro@gmail.com> | 2018-05-07 01:28:28 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-07 02:28:28 +0200 |
| commit | ea4e24330311a773b0ca76be5873e754f583dd7a (patch) | |
| tree | 429cdc544590c0f0661b0f321b3f5fe7a3b33bbc | |
| parent | 95595ccd2171e225f983166c6b259591ce8c861a (diff) | |
Improve OpenStack v3 compatibility (#7392)
* Update paperclip.rb * Update .env.production.sample * Update paperclip.rb
| -rw-r--r-- | .env.production.sample | 2 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.env.production.sample b/.env.production.sample index c936546da..24b6b0143 100644 --- 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 17a520aa2..c134bc5b8 100644 --- 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'], |