Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually use keystonev3 #5280

Merged
merged 2 commits into from
Jun 19, 2020
Merged

Actually use keystonev3 #5280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3196554
clean config for keystone v3
Keirua Jun 18, 2020
6a3811a
fix catalog v3
Keirua Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions config/env.example
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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'] %>"