Skip to content

[5.0] Adapt radosgw to keystone v3 #113

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

Merged
dirkmueller merged 1 commit into from
Jan 3, 2019
Merged

[5.0] Adapt radosgw to keystone v3 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions chef/cookbooks/ceph/recipes/radosgw_keystone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
keystone_settings = KeystoneHelper.keystone_settings(node, @cookbook_name)
register_auth_hash = { user: keystone_settings["admin_user"],
password: keystone_settings["admin_password"],
tenant: keystone_settings["admin_tenant"] }
domain: keystone_settings["admin_domain"],
project: keystone_settings["admin_project"] }

crowbar_pacemaker_sync_mark "wait-radosgw_register"

Expand All @@ -25,7 +26,7 @@
auth register_auth_hash
user_name keystone_settings["service_user"]
user_password keystone_settings["service_password"]
tenant_name keystone_settings["service_tenant"]
project_name keystone_settings["service_tenant"]
action :add_user
end

Expand All @@ -36,7 +37,7 @@
port keystone_settings["admin_port"]
auth register_auth_hash
user_name keystone_settings["service_user"]
tenant_name keystone_settings["service_tenant"]
project_name keystone_settings["service_tenant"]
role_name "admin"
action :add_access
end
Expand Down Expand Up @@ -91,7 +92,7 @@
endpoint_publicURL "#{protocol}://#{public_host}:#{port}/swift/v1"
endpoint_adminURL "#{protocol}://#{admin_host}:#{port}/swift/v1"
endpoint_internalURL "#{protocol}://#{admin_host}:#{port}/swift/v1"
action :add_endpoint_template
action :add_endpoint
end

crowbar_pacemaker_sync_mark "create-radosgw_register"
Expand Down
3 changes: 2 additions & 1 deletion chef/cookbooks/ceph/templates/default/ceph.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@
<% unless node[:ceph][:keystone_instance].nil? || node[:ceph][:keystone_instance].empty? || @keystone_settings.empty? -%>
rgw keystone url = <%= @keystone_settings['admin_auth_url'] %>
rgw keystone admin user = <%= @keystone_settings['service_user'] %>
rgw keystone admin tenant = <%= @keystone_settings['service_tenant'] %>
rgw keystone admin domain = <%= @keystone_settings['admin_domain'] %>
rgw keystone admin project = <%= @keystone_settings['admin_project'] %>
rgw keystone admin password = <%= @keystone_settings['service_password'] %>
<% if @keystone_settings['insecure'] -%>
rgw keystone verify ssl = false
Expand Down