From 56461c6614a0d7eaec40dd3b0487484b921d50ea Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Wed, 9 Feb 2022 12:53:21 +0100
Subject: [PATCH] feat(openstack): just use FOG_OPENSTACK_URL

We don't need introducing a new env var for this.
---
 config/env.example | 5 ++---
 config/storage.yml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/env.example b/config/env.example
index 56ff3d288..f557df768 100644
--- a/config/env.example
+++ b/config/env.example
@@ -28,9 +28,8 @@ BASIC_AUTH_ENABLED="disabled"
 BASIC_AUTH_USERNAME=""
 BASIC_AUTH_PASSWORD=""
 
-# Object Storage for attachments. Used if STORAGE_TYPE is not "local"
-STORAGE_TYPE="openstack"
-FOG_OPENSTACK_AUTH_URL="https://auth.cloud.ovh.net"
+# Object Storage for attachments
+FOG_ENABLED="disabled"
 FOG_OPENSTACK_API_KEY=""
 FOG_OPENSTACK_USERNAME=""
 FOG_OPENSTACK_URL=""
diff --git a/config/storage.yml b/config/storage.yml
index b86efa2e7..b24cd1613 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -8,7 +8,7 @@ openstack:
   service: OpenStack
   container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>"
   credentials:
-    openstack_auth_url: "<%= ENV['FOG_OPENSTACK_AUTH_URL'] %>"
+    openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>"
     openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>"
     openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
     openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"