openstack/puppet-openstack-integration
Code Issues Proposed changes

Switch role name from Member to member

Browse Source 
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
This commit is contained in:
Alfredo Moralejo 2018-06-18 12:00:37 +02:00
parent e20023d431
commit df32382900
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/ceph.pp
View File

@ -111,7 +111,7 @@ class openstack_integration::ceph (
rgw_keystone_version => 'v3', rgw_keystone_version => 'v3',
user => 'ceph', user => 'ceph',
use_pki => false, use_pki => false,
rgw_keystone_accepted_roles => ['admin', 'Member'], rgw_keystone_accepted_roles => ['admin', 'member'],
rgw_keystone_admin_domain => $user_domain, rgw_keystone_admin_domain => $user_domain,
rgw_keystone_admin_project => $project, rgw_keystone_admin_project => $project,
rgw_keystone_admin_user => $auth_name, rgw_keystone_admin_user => $auth_name,
@ -123,6 +123,7 @@ class openstack_integration::ceph (
password => $password, password => $password,
user => $auth_name, user => $auth_name,
tenant => $project, tenant => $project,
roles => ['admin', 'member'],
public_url => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1", public_url => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1",
admin_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", internal_url => "http://${::openstack_integration::config::ip_for_url}:8080/swift/v1",

4
manifests/keystone.pp
View File

@ -137,7 +137,7 @@ class openstack_integration::keystone (
# We need tempest users to have the creator role to be able to store # 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 # secrets in barbican. We do this by adding the creator role to the
# tempest_roles list in tempest.conf. # 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 # Ordinarily tempest code in dynamic_creds.py would create
# this role and assign users to it. This code is not executed, however, # 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 # when tempest_roles is defined. Therefore we need to make sure this
@ -145,7 +145,7 @@ class openstack_integration::keystone (
keystone_role { 'creator': keystone_role { 'creator':
ensure => present, ensure => present,
} }
keystone_role { 'Member': keystone_role { 'member':
ensure => present, ensure => present,
} }
} }

2
manifests/swift.pp
View File

@ -75,7 +75,7 @@ class openstack_integration::swift {
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::swift::proxy::keystone': class { '::swift::proxy::keystone':
operator_roles => ['Member', 'admin', 'SwiftOperator'] operator_roles => ['member', 'admin', 'SwiftOperator']
} }
include ::swift::proxy::formpost include ::swift::proxy::formpost
include ::swift::proxy::staticweb include ::swift::proxy::staticweb

3
manifests/tempest.pp
View File

@ -209,7 +209,7 @@ class openstack_integration::tempest (
admin_password => 'a_big_secret', admin_password => 'a_big_secret',
admin_domain_name => 'Default', admin_domain_name => 'Default',
auth_version => 'v3', auth_version => 'v3',
tempest_roles => ['Member', 'creator'], # needed to use barbican. tempest_roles => ['member', 'creator'], # needed to use barbican.
image_name => 'cirros', image_name => 'cirros',
image_name_alt => 'cirros_alt', image_name_alt => 'cirros_alt',
cinder_available => $cinder, cinder_available => $cinder,
@ -264,6 +264,7 @@ class openstack_integration::tempest (
img_dir => '/tmp/openstack/image', img_dir => '/tmp/openstack/image',
baremetal_driver => 'fake-hardware', baremetal_driver => 'fake-hardware',
baremetal_enabled_hardware_types => 'ipmi,fake-hardware', baremetal_enabled_hardware_types => 'ipmi,fake-hardware',
ec2api_tester_roles => ['member'],
} }
} }