diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index f647f0ea2..11d296f5a 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -78,16 +78,18 @@ include openstack_integration::octavia include openstack_integration::provision -# Don't test swift, radosgw won't pass the current tests # Glance, nova, neutron are true by default. class { 'openstack_integration::tempest': - horizon => true, - watcher => true, - bgpvpn => $bgpvpn_enabled, - l2gw => $l2gw_enabled, - l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100', - dr => $bgp_dragent_enabled, - manila => true, - share_protocol => 'CEPHFS', - octavia => true, + horizon => true, + watcher => true, + bgpvpn => $bgpvpn_enabled, + l2gw => $l2gw_enabled, + l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100', + dr => $bgp_dragent_enabled, + manila => true, + share_protocol => 'CEPHFS', + octavia => true, + # RADOS Gateway does not support ResellerAdmin role by default + reseller_admin_role => 'admin', + swift => true, } diff --git a/manifests/tempest.pp b/manifests/tempest.pp index eb4824393..6a69ebed7 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -116,6 +116,10 @@ # (optional) Define if Zaqar needs to be tested. # Default to false. # +# [*reseller_admin_role*] +# (optional) User role that has reseller admin. +# Defaults to ResellerAdmin +# # [*attach_encrypted_volume*] # (optional) Define if Encrypted Volumes need to be tested. # Default to false. @@ -177,6 +181,7 @@ class openstack_integration::tempest ( $watcher = false, $vitrage = false, $zaqar = false, + $reseller_admin_role = 'ResellerAdmin', $attach_encrypted_volume = false, $configure_images = true, $configure_networks = true, @@ -290,6 +295,7 @@ class openstack_integration::tempest ( project_domain_name => 'Default', auth_version => 'v3', tempest_roles => ['member', 'creator'], # needed to use barbican. + reseller_admin_role => $reseller_admin_role, image_name => 'cirros', image_name_alt => 'cirros_alt', cinder_available => $cinder,