From e69e459649107bd66425637ebd99f9c5a09f50a3 Mon Sep 17 00:00:00 2001
From: Frederic Merizen <frederic.merizen@gmail.com>
Date: Wed, 14 Nov 2018 15:42:09 +0100
Subject: [PATCH] [#2180] Add activestorage-openstack

---
 Gemfile            |  1 +
 Gemfile.lock       | 12 ++++++++++++
 config/storage.yml | 11 +++++++++++
 3 files changed, 24 insertions(+)

diff --git a/Gemfile b/Gemfile
index ef21b8b60..ad4e18781 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,6 +56,7 @@ gem 'carrierwave'
 gem 'carrierwave-i18n'
 gem 'copy_carrierwave_file'
 gem 'fog-openstack'
+gem 'activestorage-openstack', git: 'https://github.com/fredZen/activestorage-openstack.git', branch: 'frederic/bump-fog-openstack'
 
 gem 'pg'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2901189f9..4c3991cac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+  remote: https://github.com/fredZen/activestorage-openstack.git
+  revision: 8b64c113223e9ec431b220c9350866c4147b88c3
+  branch: frederic/bump-fog-openstack
+  specs:
+    activestorage-openstack (0.5.0)
+      fog-openstack (~> 1.0)
+      marcel
+      mime-types
+      rails (~> 5.2.0)
+
 GIT
   remote: https://github.com/hassox/warden.git
   revision: 5b3cbd5bef67cbe399bb7007537bc4841bbee772
@@ -650,6 +661,7 @@ DEPENDENCIES
   aasm
   active_link_to
   active_model_serializers
+  activestorage-openstack!
   administrate
   after_party
   axlsx (~> 3.0.0.pre)
diff --git a/config/storage.yml b/config/storage.yml
index 80f0cf275..f3370122c 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -9,3 +9,14 @@ clever_cloud:
   access_key_id: <%= ENV['CLEVER_CLOUD_ACCESS_KEY_ID'] %>
   secret_access_key: <%= ENV['CLEVER_CLOUD_SECRET_ACCESS_KEY'] %>
   bucket: <%= ENV['CLEVER_CLOUD_BUCKET'] %>
+openstack:
+  service: OpenStack
+  container: "<%= ENV['FOG_DIRECTORY'] %>"
+  credentials:
+    openstack_tenant: "<%= ENV['FOG_OPENSTACK_TENANT'] %>"
+    openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>"
+    openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
+    openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>"
+    openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>"
+    openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"
+    openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>"