mastofe

commit: 83ffc4dc07cc619c166b36e2de0b0f0e7424d672
parent: d6fe0954e319b271f3cfbb85df22aba9102746ac
Author: Nishi, Keisuke <k24@users.noreply.github.com>
Date:   Sat, 30 Sep 2017 21:28:29 +0900

Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)


Diffstat:
M
config/initializers/paperclip.rb
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
@@ -48,6 +48,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
       provider: 'OpenStack',
       openstack_username: ENV.fetch('SWIFT_USERNAME'),
       openstack_project_name: ENV.fetch('SWIFT_TENANT'),
+      openstack_tenant: ENV.fetch('SWIFT_TENANT'), # Some OpenStack-v2 ignores project_name but needs tenant
       openstack_api_key: ENV.fetch('SWIFT_PASSWORD'),
       openstack_auth_url: ENV.fetch('SWIFT_AUTH_URL'),
       openstack_domain_name: ENV['SWIFT_DOMAIN_NAME'] || 'default',
@@ -55,7 +56,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
       openstack_cache_ttl: ENV['SWIFT_CACHE_TTL'] || 60,
     },
     fog_directory: ENV.fetch('SWIFT_CONTAINER'),
-    fog_host: ENV.fetch('SWIFT_OBJECT_URL'),
+    fog_host: ENV['SWIFT_OBJECT_URL'],
     fog_public: true
   )
 else