From 03d2deca125b8645ebdf7543e8354c0c71463705 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 21 Mar 2018 11:30:25 +0800 Subject: [PATCH] oslo middleware: check puppet resource instead of actual config in spec Change-Id: I958363088412a9875c4ed249977dd14bd9d8ef82 --- spec/classes/nova_api_spec.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb index 25b19850f..0f6ae5427 100644 --- a/spec/classes/nova_api_spec.rb +++ b/spec/classes/nova_api_spec.rb @@ -54,7 +54,9 @@ describe 'nova::api' do is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5') is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '5') is_expected.to contain_nova_config('api/fping_path').with('value' => '/usr/sbin/fping') - is_expected.to contain_nova_config('oslo_middleware/enable_proxy_headers_parsing').with('value' => '') + is_expected.to contain_oslo__middleware('nova_config').with( + :enable_proxy_headers_parsing => '', + ) is_expected.to contain_nova_config('api/metadata_cache_expiration').with('value' => '') is_expected.to contain_nova_config('api/vendordata_jsonfile_path').with('value' => '') is_expected.to contain_nova_config('api/vendordata_providers').with('value' => '') @@ -170,7 +172,9 @@ describe 'nova::api' do is_expected.to contain_nova_config('api/glance_link_prefix').with('value' => 'https://10.0.0.1:6666/') is_expected.to contain_nova_config('neutron/service_metadata_proxy').with('value' => true) is_expected.to contain_nova_config('neutron/metadata_proxy_shared_secret').with('value' => 'secrete').with_secret(true) - is_expected.to contain_nova_config('oslo_middleware/enable_proxy_headers_parsing').with('value' => true) + is_expected.to contain_oslo__middleware('nova_config').with( + :enable_proxy_headers_parsing => true, + ) is_expected.to contain_nova_config('api/hide_server_address_states').with('value' => 'building') is_expected.to contain_nova_config('api/allow_instance_snapshots').with('value' => true) is_expected.to contain_nova_config('DEFAULT/enable_network_quota').with('value' => false)