Skip to content

Commit

Permalink
#5280 actually use keystonev3
Browse files Browse the repository at this point in the history
Actually use keystonev3
  • Loading branch information
LeSim authored Jun 19, 2020
2 parents 2d443f4 + 6a3811a commit 61c10bb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions config/env.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ BASIC_AUTH_USERNAME=""
BASIC_AUTH_PASSWORD=""

# Object Storage pour les pièces jointes
FOG_OPENSTACK_TENANT=""
FOG_OPENSTACK_API_KEY=""
FOG_OPENSTACK_USERNAME=""
FOG_OPENSTACK_URL=""
FOG_OPENSTACK_IDENTITY_API_VERSION=""
FOG_OPENSTACK_REGION=""
FOG_ENABLED="" # valeur attendue: enabled
DS_PROXY_URL=""
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/active_storage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def publicize(url)
module Fog::OpenStack::Auth::Catalog
class V3
def endpoint_url(endpoint, interface)
url = endpoint["#{interface}URL"]
url = endpoint["url"]

if interface == 'public'
publicize(url)
Expand Down
4 changes: 1 addition & 3 deletions config/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ openstack:
service: OpenStack
container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>"
credentials:
openstack_tenant: "<%= ENV['FOG_OPENSTACK_TENANT'] %>"
openstack_auth_url: "https://auth.cloud.ovh.net"
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'] %>"

0 comments on commit 61c10bb

Please sign in to comment.