#5280 actually use keystonev3

Actually use keystonev3
This commit is contained in:
LeSim 2020-06-19 14:34:31 +02:00 committed by GitHub
commit 61c10bb72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions

View file

@ -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=""

View file

@ -45,7 +45,7 @@ require 'fog/openstack/auth/catalog/v3'
module Fog::OpenStack::Auth::Catalog
class V3
def endpoint_url(endpoint, interface)
url = endpoint["#{interface}URL"]
url = endpoint["url"]
if interface == 'public'
publicize(url)

View file

@ -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'] %>"