openstack
/
fuel-library
Code Issues Proposed changes

Merge "Enable caching for Heat validation process"

This commit is contained in:
Jenkins 2016-01-20 14:32:39 +00:00 committed by Gerrit Code Review
parent 0966a3504c b5a06d8bec
commit 53e9b493db
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -39,6 +39,7 @@ $use_syslog = hiera('use_syslog', true)
$syslog_log_facility_heat = hiera('syslog_log_facility_heat')
$deployment_mode = hiera('deployment_mode')
$bind_address = get_network_role_property('heat/api', 'ipaddr')
$memcache_address = get_network_role_property('mgmt/memcache', 'ipaddr')
$database_password = $heat_hash['db_password']
$keystone_user = pick($heat_hash['user'], 'heat')
$keystone_tenant = pick($heat_hash['tenant'], 'services')
@ -120,6 +121,13 @@ if $sahara_hash['enabled'] {
}
}
# Turn on Caching for Heat validation process
heat_config {
'cache/enabled': value => true;
'cache/backend': value => 'oslo_cache.memcache_pool';
'cache/memcache_servers': value => "${memcache_address}:11211";
}
#------------------------------
class heat::docker_resource (

11
tests/noop/spec/hosts/heat/heat_spec.rb
View File

@ -13,6 +13,11 @@ describe manifest do
Noop.puppet_function 'prepare_network_config', network_scheme
end
let(:memcache_address) do
prepare
Noop.puppet_function 'get_network_role_property', 'mgmt/memcache', 'ipaddr'
end
admin_auth_protocol = 'http'
admin_auth_address = Noop.hiera('service_endpoint')
if Noop.hiera_structure('use_ssl', false)
@ -85,6 +90,12 @@ describe manifest do
should contain_heat_config('DEFAULT/max_json_body_size').with_value('10880000')
end
it 'should configure caching for validation process' do
should contain_heat_config('cache/enabled').with_value('true')
should contain_heat_config('cache/backend').with_value('oslo_cache.memcache_pool')
should contain_heat_config('cache/memcache_servers').with_value("#{memcache_address}:11211")
end
it 'should configure heat rpc response timeout' do
should contain_heat_config('DEFAULT/rpc_response_timeout').with_value('600')
end