From df32382900f340c3018e8f74b2905301f79d3cd3 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Mon, 18 Jun 2018 12:00:37 +0200
Subject: [PATCH] Switch role name from Member to member

keystone is creating default roles for member since [1]. This
is "member" and it's not configurable so we need to switch it
in p-o-i too to avoid conflicting names errors (keystone is not
case sensitive in object names).

[1] https://review.openstack.org/#/c/572243/

Depends-On: Icd91bd27d0c0f375d2e99e9c018d3971fc49ce18
Change-Id: Id838d69e4ace9b2ea6c2a9cc6f8fd079d2115dd6
---
 manifests/ceph.pp     | 3 ++-
 manifests/keystone.pp | 4 ++--
 manifests/swift.pp    | 2 +-
 manifests/tempest.pp  | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index c77318a48..891db7a17 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -111,7 +111,7 @@ class openstack_integration::ceph (
       rgw_keystone_version        => 'v3',
       user                        => 'ceph',
       use_pki                     => false,
-      rgw_keystone_accepted_roles => ['admin', 'Member'],
+      rgw_keystone_accepted_roles => ['admin', 'member'],
       rgw_keystone_admin_domain   => $user_domain,
       rgw_keystone_admin_project  => $project,
       rgw_keystone_admin_user     => $auth_name,
@@ -123,6 +123,7 @@ class openstack_integration::ceph (
         password     => $password,
         user         => $auth_name,
         tenant       => $project,
+        roles        => ['admin', 'member'],
         public_url   => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1",
         admin_url    => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1",
         internal_url => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1",
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index e7f8ebff3..25a184faa 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -137,7 +137,7 @@ class openstack_integration::keystone (
   # We need tempest users to have the creator role to be able to store
   # secrets in barbican.  We do this by adding the creator role to the
   # tempest_roles list in tempest.conf.
-  # We also need the Member role for some swift container tests.
+  # We also need the member role for some swift container tests.
   # Ordinarily tempest code in dynamic_creds.py would create
   # this role and assign users to it.  This code is not executed, however,
   # when tempest_roles is defined.  Therefore we need to make sure this
@@ -145,7 +145,7 @@ class openstack_integration::keystone (
   keystone_role { 'creator':
     ensure => present,
   }
-  keystone_role { 'Member':
+  keystone_role { 'member':
     ensure => present,
   }
 }
diff --git a/manifests/swift.pp b/manifests/swift.pp
index e1c93e3f1..d352edc46 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -75,7 +75,7 @@ class openstack_integration::swift {
     password => 'a_big_secret',
   }
   class { '::swift::proxy::keystone':
-    operator_roles => ['Member', 'admin', 'SwiftOperator']
+    operator_roles => ['member', 'admin', 'SwiftOperator']
   }
   include ::swift::proxy::formpost
   include ::swift::proxy::staticweb
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 4e007f933..edc103edd 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -209,7 +209,7 @@ class openstack_integration::tempest (
     admin_password                   => 'a_big_secret',
     admin_domain_name                => 'Default',
     auth_version                     => 'v3',
-    tempest_roles                    => ['Member', 'creator'], # needed to use barbican.
+    tempest_roles                    => ['member', 'creator'], # needed to use barbican.
     image_name                       => 'cirros',
     image_name_alt                   => 'cirros_alt',
     cinder_available                 => $cinder,
@@ -264,6 +264,7 @@ class openstack_integration::tempest (
     img_dir                          => '/tmp/openstack/image',
     baremetal_driver                 => 'fake-hardware',
     baremetal_enabled_hardware_types => 'ipmi,fake-hardware',
+    ec2api_tester_roles              => ['member'],
   }
 
 }