Skip to content

Commit

Permalink
Adapt radosgw to keystone v3
Browse files Browse the repository at this point in the history
Needed after crowbar-openstack commit 8774f1a509
Use keystone v3 in config auth urls (SCRD-781)
  • Loading branch information
bmwiedemann committed Oct 4, 2018
1 parent ea74a75 commit 2960dcd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions chef/cookbooks/ceph/recipes/radosgw_keystone.rb
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
3 changes: 2 additions & 1 deletion chef/cookbooks/ceph/templates/default/ceph.conf.erb
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

0 comments on commit 2960dcd

Please sign in to comment.