openstack
/
puppet-tempest
Code Issues Proposed changes

Add support for more [enforce_scope] options 

This introduces a few [enforce_scope] options of tempest plugins
(designate, ironic, manila and octavia)

Change-Id: I86971e7d515c54fa54d47c8f9ef07c358c4a5b67
This commit is contained in:
Takashi Kajinami 2023-03-21 02:16:53 +09:00
parent 9aeebf62f7
commit a5fd91221b
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@ -199,6 +199,16 @@
# Defaults to $facts['os_service_default']
# [*placement_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*ironic_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*ironic_inspector_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*designate_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*octavia_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*manila_enforce_scope*]
# Defaults to $facts['os_service_default']
# [*keystone_v3*]
# Defaults to true
# [*auth_version*]
@ -410,6 +420,11 @@ class tempest(
$neutron_enforce_scope = $facts['os_service_default'],
$nova_enforce_scope = $facts['os_service_default'],
$placement_enforce_scope = $facts['os_service_default'],
$ironic_enforce_scope = $facts['os_service_default'],
$ironic_inspector_enforce_scope = $facts['os_service_default'],
$designate_enforce_scope = $facts['os_service_default'],
$octavia_enforce_scope = $facts['os_service_default'],
$manila_enforce_scope = $facts['os_service_default'],
$keystone_v3 = true,
$auth_version = 'v3',
$run_service_broker_tests = false,
@ -631,11 +646,16 @@ class tempest(
'service_available/ec2api': value => $ec2api_available;
'service_available/octavia': value => $octavia_available;
'enforce_scope/cinder': value => $cinder_enforce_scope;
'enforce_scope/designate': value => $designate_enforce_scope;
'enforce_scope/glance': value => $glance_enforce_scope;
'enforce_scope/ironic': value => $ironic_enforce_scope;
'enforce_scope/ironic_inspector': value => $ironic_inspector_enforce_scope;
'enforce_scope/keystone': value => $keystone_enforce_scope;
'identity-feature-enabled/enforce_scope': value => $keystone_enforce_scope;
'enforce_scope/manila': value => $manila_enforce_scope;
'enforce_scope/neutron': value => $neutron_enforce_scope;
'enforce_scope/nova': value => $nova_enforce_scope;
'enforce_scope/octavia': value => $octavia_enforce_scope;
'enforce_scope/placement': value => $placement_enforce_scope;
'cli/cli_dir': value => $cli_dir;
'scenario/img_file': value => $img_file;

10
releasenotes/notes/more-enforce_scope-103a6d7c2ba5b0b5.yaml Normal file
View File

@ -0,0 +1,10 @@
---
features:
- |
The following parameters have been added to the ``tempest`` class.
- ``designate_enforce_scope``
- ``ironic_enforce_scope``
- ``ironic_inspector_enforce_scope``
- ``manila_enforce_scope``
- ``octavia_enforce_scope``

5
spec/classes/tempest_init_spec.rb
View File

@ -280,6 +280,11 @@ 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('enforce_scope/placement').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/ironic').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/ironic_inspector').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/designate').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/octavia').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/manila').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>')