From 6f2d894dafa12c47b9c31b8d2a6ffaef266dde5c Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Tue, 14 Nov 2017 15:39:53 +0100
Subject: [PATCH 1/2] Remove superfluous role_name arguments

This patch removes the role_name when using openstack_user's :create
action (it gets ignored by the target method).
---
 recipes/identity_registration.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index eef028c..10ce629 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -83,7 +83,6 @@ end
 # Register Service User
 openstack_user service_user do
   project_name service_project_name
-  role_name service_role
   password service_pass
   connection_params connection_params
 end

From be7279b8419773ac9d584de38e64dacc7a4d5ab9 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Thu, 9 Nov 2017 14:19:57 +0100
Subject: [PATCH 2/2] Remove domain role from designate service user

This patch removes the openstack_user resource with :grant_domain
action. A user is always created within a specific domain; such a
mmembership cannot be tacked on later. This resource gave the user the
role intended for their project for the domain (i.e., for the Default
domain instead of for the service project).

We add the domain_name attribute that creates the designate user in
the desired domain. Note that this change needs a sufficiently recent
openstackclient cookbook -- otherwise the domain_name attribute is
ignored (which does not matter as long as the designate user is to be
created in the Default domain).
---
 recipes/identity_registration.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 10ce629..a803fee 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -83,6 +83,7 @@ end
 # Register Service User
 openstack_user service_user do
   project_name service_project_name
+  domain_name service_domain_name
   password service_pass
   connection_params connection_params
 end
@@ -94,11 +95,3 @@ openstack_user service_user do
   connection_params connection_params
   action :grant_role
 end
-
-openstack_user service_user do
-  domain_name service_domain_name
-  role_name service_role
-  user_name service_user
-  connection_params connection_params
-  action :grant_domain
-end