openstack/puppet-tempest
Code Issues Proposed changes

Add support for ec2api-tempest-plugin options

Browse Source 
This change introduces support for some ec2api-tempest-plugin options.
These options are required to run basic tests such as instance
creation.

Change-Id: I97557077330e5dc52d66800cef2ac113957abcaf
This commit is contained in:
Takashi Kajinami 2023-02-01 11:07:06 +09:00
parent c20412b758
commit d37fb92c10
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@ -231,6 +231,14 @@
# Defaults to $::os_service_default
# [*ec2api_tester_roles*]
# Defaults to ['Member']
# [*aws_ec2_url*]
# Defaults to $::os_service_default
# [*aws_region*]
# Defaults to $::os_service_default
# [*aws_image_id*]
# Defualts to undef
# [*aws_ebs_image_id*]
# Defaults to undef
# [*heat_image_ref*]
# Defaults to undef
# [*heat_image_name*]
@ -409,6 +417,10 @@ class tempest(
$designate_nameservers = $::os_service_default,
# ec2api options
$ec2api_tester_roles = ['Member'],
$aws_ec2_url = $::os_service_default,
$aws_region = $::os_service_default,
$aws_image_id = undef,
$aws_ebs_image_id = undef,
# heat options
$heat_image_ref = undef,
$heat_image_name = undef,
@ -625,6 +637,11 @@ class tempest(
'compute-feature-enabled/resize': value => $resize_available;
# designate-tempest-plugin
'dns/nameservers': value => join(any2array($designate_nameservers), ',');
# ec2api-tempest-plugin
'aws/ec2_url': value => $aws_ec2_url;
'aws/aws_region': value => $aws_region;
'aws/image_id': value => $aws_image_id;
'aws/ebs_image_id': value => $aws_ebs_image_id;
# heat-tempest-plugin
'heat_plugin/auth_url': value => $identity_uri_v3;
# TODO(tkajinam): auth_version does not affect vN format (eg v3) and

9
releasenotes/notes/ec2api-opts-d799fac8bed8ce2b.yaml Normal file
View File

@ -0,0 +1,9 @@
---
features:
- |
The following parameters have been added to the ``tempest`` class.
- ``aws_ec2_url``
- ``aws_region``
- ``aws_image_id``
- ``aws_ebs_image_id``

4
spec/classes/tempest_init_spec.rb
View File

@ -279,6 +279,10 @@ describe 'tempest' do
is_expected.to contain_tempest_config('enforce_scope/neutron').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/nova').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('dns/nameservers').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('aws/ec2_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('aws/aws_region').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('aws/image_id').with(:value => nil)
is_expected.to contain_tempest_config('aws/ebs_image_id').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/auth_url').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/auth_version').with(:value => '3')
is_expected.to contain_tempest_config('heat_plugin/admin_password').with_secret( true )