openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Run swift tests with RADOS Gateway"

Browse Source
This commit is contained in:
Zuul 2023-10-16 21:01:09 +00:00 committed by Gerrit Code Review
commit f865eb49bf
2 changed files with 18 additions and 10 deletions
fixtures
scenario004.pp
manifests
tempest.pp

22
fixtures/scenario004.pp

@ -78,16 +78,18 @@ include openstack_integration::octavia
include openstack_integration::provision include openstack_integration::provision
# Don't test swift, radosgw won't pass the current tests
# Glance, nova, neutron are true by default. # Glance, nova, neutron are true by default.
class { 'openstack_integration::tempest': class { 'openstack_integration::tempest':
horizon => true, horizon => true,
watcher => true, watcher => true,
bgpvpn => $bgpvpn_enabled, bgpvpn => $bgpvpn_enabled,
l2gw => $l2gw_enabled, l2gw => $l2gw_enabled,
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100', l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
dr => $bgp_dragent_enabled, dr => $bgp_dragent_enabled,
manila => true, manila => true,
share_protocol => 'CEPHFS', share_protocol => 'CEPHFS',
octavia => true, octavia => true,
# RADOS Gateway does not support ResellerAdmin role by default
reseller_admin_role => 'admin',
swift => true,
} }

6
manifests/tempest.pp

@ -116,6 +116,10 @@
# (optional) Define if Zaqar needs to be tested. # (optional) Define if Zaqar needs to be tested.
# Default to false. # Default to false.
# #
# [*reseller_admin_role*]
# (optional) User role that has reseller admin.
# Defaults to ResellerAdmin
#
# [*attach_encrypted_volume*] # [*attach_encrypted_volume*]
# (optional) Define if Encrypted Volumes need to be tested. # (optional) Define if Encrypted Volumes need to be tested.
# Default to false. # Default to false.
@ -177,6 +181,7 @@ class openstack_integration::tempest (
$watcher = false, $watcher = false,
$vitrage = false, $vitrage = false,
$zaqar = false, $zaqar = false,
$reseller_admin_role = 'ResellerAdmin',
$attach_encrypted_volume = false, $attach_encrypted_volume = false,
$configure_images = true, $configure_images = true,
$configure_networks = true, $configure_networks = true,
@ -290,6 +295,7 @@ class openstack_integration::tempest (
project_domain_name => 'Default', project_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.
reseller_admin_role => $reseller_admin_role,
image_name => 'cirros', image_name => 'cirros',
image_name_alt => 'cirros_alt', image_name_alt => 'cirros_alt',
cinder_available => $cinder, cinder_available => $cinder,