openstack
/
puppet-nova
Code Issues Proposed changes

stable-only: Disable assertion of provider.yaml 

The assertion started failing since bundler is bumped to 2.4.22 .
Because stable/zed is being transitioned to unmaintained, we agreed
to disable the failing assertions so that we can merge a few remaining
backports quickly.

Depends-on: https://review.opendev.org/916425
Change-Id: I45929a5c8affc4b2b9ada70c04d9cd0afdf23d2a
This commit is contained in:
Takashi Kajinami 2024-04-26 17:22:15 +09:00
parent 997172e801
commit aa04f49a4a
1 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
spec/classes/nova_compute_provider_spec.rb
View File

@ -56,28 +56,28 @@ describe 'nova::compute::provider' do
it 'configure provider.yaml on compute nodes' do
is_expected.to contain_file('/etc/nova/provider_config/provider.yaml')
verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
"meta:",
" schema_version: \'1.0\'",
"providers:",
" # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
" - identification:",
" uuid: \'$COMPUTE_NODE\'",
" inventories:",
" additional:",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
" allocation_ratio: 1.0",
" max_unit: 10",
" min_unit: 1",
" reserved: 0",
" step_size: 1",
" total: 100",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
" total: 100",
" traits:",
" additional:",
" - \'CUSTOM_P_STATE_ENABLED\'",
" - \'CUSTOM_C_STATE_ENABLED\'"
# verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
# "meta:",
# " schema_version: \'1.0\'",
# "providers:",
# " # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
# " - identification:",
# " uuid: \'$COMPUTE_NODE\'",
# " inventories:",
# " additional:",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
# " allocation_ratio: 1.0",
# " max_unit: 10",
# " min_unit: 1",
# " reserved: 0",
# " step_size: 1",
# " total: 100",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
# " total: 100",
# " traits:",
# " additional:",
# " - \'CUSTOM_P_STATE_ENABLED\'",
# " - \'CUSTOM_C_STATE_ENABLED\'"
])
end
end
@ -112,29 +112,29 @@ describe 'nova::compute::provider' do
it 'configure provider.yaml on compute nodes' do
is_expected.to contain_file('/etc/nova/provider_config/provider.yaml')
verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
"meta:",
" schema_version: \'1.0\'",
"providers:",
" # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
" - identification:",
" uuid: \'5213b75d-9260-42a6-b236-f39b0fd10561\'",
" inventories:",
" additional:",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
" allocation_ratio: 1.0",
" max_unit: 10",
" min_unit: 1",
" reserved: 0",
" step_size: 1",
" total: 100",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
" total: 100",
" traits:",
" additional:",
" - \'CUSTOM_P_STATE_ENABLED\'",
" - \'CUSTOM_C_STATE_ENABLED\'"
])
# verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
# "meta:",
# " schema_version: \'1.0\'",
# "providers:",
# " # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
# " - identification:",
# " uuid: \'5213b75d-9260-42a6-b236-f39b0fd10561\'",
# " inventories:",
# " additional:",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
# " allocation_ratio: 1.0",
# " max_unit: 10",
# " min_unit: 1",
# " reserved: 0",
# " step_size: 1",
# " total: 100",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
# " total: 100",
# " traits:",
# " additional:",
# " - \'CUSTOM_P_STATE_ENABLED\'",
# " - \'CUSTOM_C_STATE_ENABLED\'"
# ])
end
end
@ -168,29 +168,29 @@ describe 'nova::compute::provider' do
it 'configure provider.yaml on compute nodes' do
is_expected.to contain_file('/etc/nova/provider_config/provider.yaml')
verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
"meta:",
" schema_version: \'1.0\'",
"providers:",
" # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
" - identification:",
" name: \'EXAMPLE_RESOURCE_PROVIDER\'",
" inventories:",
" additional:",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
" allocation_ratio: 1.0",
" max_unit: 10",
" min_unit: 1",
" reserved: 0",
" step_size: 1",
" total: 100",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
" total: 100",
" traits:",
" additional:",
" - \'CUSTOM_P_STATE_ENABLED\'",
" - \'CUSTOM_C_STATE_ENABLED\'"
])
# verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
# "meta:",
# " schema_version: \'1.0\'",
# "providers:",
# " # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
# " - identification:",
# " name: \'EXAMPLE_RESOURCE_PROVIDER\'",
# " inventories:",
# " additional:",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
# " allocation_ratio: 1.0",
# " max_unit: 10",
# " min_unit: 1",
# " reserved: 0",
# " step_size: 1",
# " total: 100",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
# " total: 100",
# " traits:",
# " additional:",
# " - \'CUSTOM_P_STATE_ENABLED\'",
# " - \'CUSTOM_C_STATE_ENABLED\'"
# ])
end
end
@ -232,38 +232,38 @@ describe 'nova::compute::provider' do
it 'configure provider.yaml on compute nodes' do
is_expected.to contain_file('/etc/nova/provider_config/provider.yaml')
verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
"meta:",
" schema_version: \'1.0\'",
"providers:",
" # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
" - identification:",
" uuid: \'$COMPUTE_NODE\'",
" inventories:",
" additional:",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
" allocation_ratio: 1.0",
" max_unit: 10",
" min_unit: 1",
" reserved: 0",
" step_size: 1",
" total: 100",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
" total: 100",
" traits:",
" additional:",
" - \'CUSTOM_P_STATE_ENABLED\'",
" - \'CUSTOM_C_STATE_ENABLED\'",
" - identification:",
" name: \'EXAMPLE_RESOURCE_PROVIDER\'",
" inventories:",
" additional:",
" - CUSTOM_EXAMPLE_RESOURCE_CLASS:",
" reserved: 100",
" total: 10000",
" traits:",
" additional:"
])
# verify_contents(catalogue, '/etc/nova/provider_config/provider.yaml', [
# "meta:",
# " schema_version: \'1.0\'",
# "providers:",
# " # for details check https://docs.openstack.org/nova/latest/admin/managing-resource-providers.html",
# " - identification:",
# " uuid: \'$COMPUTE_NODE\'",
# " inventories:",
# " additional:",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_1:",
# " allocation_ratio: 1.0",
# " max_unit: 10",
# " min_unit: 1",
# " reserved: 0",
# " step_size: 1",
# " total: 100",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS_2:",
# " total: 100",
# " traits:",
# " additional:",
# " - \'CUSTOM_P_STATE_ENABLED\'",
# " - \'CUSTOM_C_STATE_ENABLED\'",
# " - identification:",
# " name: \'EXAMPLE_RESOURCE_PROVIDER\'",
# " inventories:",
# " additional:",
# " - CUSTOM_EXAMPLE_RESOURCE_CLASS:",
# " reserved: 100",
# " total: 10000",
# " traits:",
# " additional:"
# ])
end
end
end