openstack
/
puppet-heat
Code Issues Proposed changes

add more heat.conf settings to heat, engine classes 

heat.conf settings added:

 max_template_size
 max_json_body_size
 max_resources_per_stack
 notification_driver
 instance_connection_https_validate_certificates
 instance_connection_is_secure

Change-Id: I00db48bb7e5fde7ba1048fc1cb24fcdcf4e85c04
This commit is contained in:
Mykyta Karpin 2015-10-12 14:50:55 +03:00
parent e328ef849d
commit 6aa38dc8ae
4 changed files with 87 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
manifests/engine.pp
View File

@ -77,20 +77,35 @@
# configure the keystone roles. # configure the keystone roles.
# Defaults to ['heat_stack_owner'] # Defaults to ['heat_stack_owner']
# #
# [*instance_connection_is_secure*]
# (Optional) Instance connection to CFN/CW API via https.
# Defaults to $::os_service_default
#
# [*instance_connection_https_validate_certificates*]
# (Optional) Instance connection to CFN/CW API validate certs if SSL is used.
# Defaults to $::os_service_default
#
# [*max_resources_per_stack*]
# (Optional) Maximum resources allowed per top-level stack.
# Defaults to $::os_service_default
#
class heat::engine ( class heat::engine (
$auth_encryption_key, $auth_encryption_key,
$package_ensure = 'present', $package_ensure = 'present',
$manage_service = true, $manage_service = true,
$enabled = true, $enabled = true,
$heat_stack_user_role = 'heat_stack_user', $heat_stack_user_role = 'heat_stack_user',
$heat_metadata_server_url = 'http://127.0.0.1:8000', $heat_metadata_server_url = 'http://127.0.0.1:8000',
$heat_waitcondition_server_url = 'http://127.0.0.1:8000/v1/waitcondition', $heat_waitcondition_server_url = 'http://127.0.0.1:8000/v1/waitcondition',
$heat_watch_server_url = 'http://127.0.0.1:8003', $heat_watch_server_url = 'http://127.0.0.1:8003',
$engine_life_check_timeout = '2', $engine_life_check_timeout = '2',
$deferred_auth_method = 'trusts', $deferred_auth_method = 'trusts',
$default_software_config_transport = 'POLL_SERVER_CFN', $default_software_config_transport = 'POLL_SERVER_CFN',
$default_deployment_signal_transport = 'CFN_SIGNAL', $default_deployment_signal_transport = 'CFN_SIGNAL',
$trusts_delegated_roles = ['heat_stack_owner'], $trusts_delegated_roles = ['heat_stack_owner'],
$instance_connection_is_secure = $::os_service_default,
$instance_connection_https_validate_certificates = $::os_service_default,
$max_resources_per_stack = $::os_service_default,
) { ) {
include ::heat::deps include ::heat::deps
@ -131,15 +146,18 @@ class heat::engine (
} }
heat_config { heat_config {
'DEFAULT/auth_encryption_key' : value => $auth_encryption_key; 'DEFAULT/auth_encryption_key': value => $auth_encryption_key;
'DEFAULT/heat_stack_user_role' : value => $heat_stack_user_role; 'DEFAULT/heat_stack_user_role': value => $heat_stack_user_role;
'DEFAULT/heat_metadata_server_url' : value => $heat_metadata_server_url; 'DEFAULT/heat_metadata_server_url': value => $heat_metadata_server_url;
'DEFAULT/heat_waitcondition_server_url' : value => $heat_waitcondition_server_url; 'DEFAULT/heat_waitcondition_server_url': value => $heat_waitcondition_server_url;
'DEFAULT/heat_watch_server_url' : value => $heat_watch_server_url; 'DEFAULT/heat_watch_server_url': value => $heat_watch_server_url;
'DEFAULT/engine_life_check_timeout' : value => $engine_life_check_timeout; 'DEFAULT/engine_life_check_timeout': value => $engine_life_check_timeout;
'DEFAULT/default_software_config_transport' : value => $default_software_config_transport; 'DEFAULT/default_software_config_transport': value => $default_software_config_transport;
'DEFAULT/default_deployment_signal_transport' : value => $default_deployment_signal_transport; 'DEFAULT/default_deployment_signal_transport': value => $default_deployment_signal_transport;
'DEFAULT/trusts_delegated_roles' : value => $trusts_delegated_roles; 'DEFAULT/trusts_delegated_roles': value => $trusts_delegated_roles;
'DEFAULT/deferred_auth_method' : value => $deferred_auth_method; 'DEFAULT/deferred_auth_method': value => $deferred_auth_method;
'DEFAULT/max_resources_per_stack': value => $max_resources_per_stack;
'DEFAULT/instance_connection_https_validate_certificates': value => $instance_connection_https_validate_certificates;
'DEFAULT/instance_connection_is_secure': value => $instance_connection_is_secure;
} }
} }

20
manifests/init.pp
View File

@ -99,6 +99,20 @@
# (Optional) Use durable queues in amqp. # (Optional) Use durable queues in amqp.
# Defaults to false # Defaults to false
# #
# [*max_template_size*]
# (Optional) Maximum raw byte size of any template.
# Defaults to $::os_service_default
#
# [*max_json_body_size*]
# (Optional) Maximum raw byte size of JSON request body.
# Should be larger than max_template_size.
# Defaults to $::os_service_default
#
# [*notification_driver*]
# (Optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list.
# Defaults to $::os_service_default
#
# == keystone authentication options # == keystone authentication options
# #
# [*auth_uri*] # [*auth_uri*]
@ -293,6 +307,9 @@ class heat(
$enable_stack_adopt = $::os_service_default, $enable_stack_adopt = $::os_service_default,
$enable_stack_abandon = $::os_service_default, $enable_stack_abandon = $::os_service_default,
$sync_db = undef, $sync_db = undef,
$max_template_size = $::os_service_default,
$max_json_body_size = $::os_service_default,
$notification_driver = $::os_service_default,
# Deprecated parameters # Deprecated parameters
$mysql_module = undef, $mysql_module = undef,
$sql_connection = undef, $sql_connection = undef,
@ -462,6 +479,9 @@ class heat(
heat_config { heat_config {
'DEFAULT/rpc_backend': value => $rpc_backend; 'DEFAULT/rpc_backend': value => $rpc_backend;
'DEFAULT/rpc_response_timeout': value => $rpc_response_timeout; 'DEFAULT/rpc_response_timeout': value => $rpc_response_timeout;
'DEFAULT/max_template_size': value => $max_template_size;
'DEFAULT/max_json_body_size': value => $max_json_body_size;
'DEFAULT/notification_driver': value => $notification_driver;
'DEFAULT/region_name_for_services': value => $region_name; 'DEFAULT/region_name_for_services': value => $region_name;
'DEFAULT/enable_stack_abandon': value => $enable_stack_abandon; 'DEFAULT/enable_stack_abandon': value => $enable_stack_abandon;
'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt; 'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt;

3
spec/classes/heat_engine_spec.rb
View File

@ -69,6 +69,9 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/deferred_auth_method').with_value( expected_params[:deferred_auth_method] ) } it { is_expected.to contain_heat_config('DEFAULT/deferred_auth_method').with_value( expected_params[:deferred_auth_method] ) }
it { is_expected.to contain_heat_config('DEFAULT/default_software_config_transport').with_value( expected_params[:default_software_config_transport] ) } it { is_expected.to contain_heat_config('DEFAULT/default_software_config_transport').with_value( expected_params[:default_software_config_transport] ) }
it { is_expected.to contain_heat_config('DEFAULT/default_deployment_signal_transport').with_value( expected_params[:default_deployment_signal_transport] ) } it { is_expected.to contain_heat_config('DEFAULT/default_deployment_signal_transport').with_value( expected_params[:default_deployment_signal_transport] ) }
it { is_expected.to contain_heat_config('DEFAULT/instance_connection_is_secure').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('DEFAULT/instance_connection_https_validate_certificates').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('DEFAULT/max_resources_per_stack').with_value('<SERVICE DEFAULT>') }
end end
context 'with disabled service managing' do context 'with disabled service managing' do

24
spec/classes/heat_init_spec.rb
View File

@ -78,6 +78,7 @@ describe 'heat' do
it_configures "with custom keystone identity_uri" it_configures "with custom keystone identity_uri"
it_configures "with custom keystone identity_uri and auth_uri" it_configures "with custom keystone identity_uri and auth_uri"
it_configures 'with enable_stack_adopt and enable_stack_abandon set' it_configures 'with enable_stack_adopt and enable_stack_abandon set'
it_configures 'with notification_driver set to a string'
end end
shared_examples_for 'a heat base installation' do shared_examples_for 'a heat base installation' do
@ -97,6 +98,14 @@ describe 'heat' do
is_expected.to contain_class('heat::db::sync') is_expected.to contain_class('heat::db::sync')
end end
it 'configures max_template_size' do
is_expected.to contain_heat_config('DEFAULT/max_template_size').with_value('<SERVICE DEFAULT>')
end
it 'configures max_json_body_size' do
is_expected.to contain_heat_config('DEFAULT/max_json_body_size').with_value('<SERVICE DEFAULT>')
end
it 'configures auth_uri' do it 'configures auth_uri' do
is_expected.to contain_heat_config('keystone_authtoken/auth_uri').with_value( params[:auth_uri] ) is_expected.to contain_heat_config('keystone_authtoken/auth_uri').with_value( params[:auth_uri] )
end end
@ -111,6 +120,9 @@ describe 'heat' do
is_expected.to contain_heat_config('keystone_authtoken/admin_password').with_secret(true) is_expected.to contain_heat_config('keystone_authtoken/admin_password').with_secret(true)
end end
it 'configures notification_driver' do
is_expected.to contain_heat_config('DEFAULT/notification_driver').with_value('<SERVICE DEFAULT>')
end
end end
@ -439,6 +451,18 @@ describe 'heat' do
end end
end end
shared_examples_for 'with notification_driver set to a string' do
before do
params.merge!(
:notification_driver => 'bar.foo.rpc_notifier',
)
end
it 'has notification_driver set when specified' do
is_expected.to contain_heat_config('DEFAULT/notification_driver').with_value('bar.foo.rpc_notifier')
end
end
context 'on Debian platforms' do context 'on Debian platforms' do
let :facts do let :facts do
@default_facts.merge({ @default_facts.merge({