openstack
/
puppet-heat
Code Issues Proposed changes

Add support for clients_heat/url option 

This option is used for connection between Heat
and other OpenStack services.

Change-Id: I7ec1fcfaeb29634a1246e17b0d41b63d1d505fda
This commit is contained in:
iberezovskiy 2016-05-20 17:38:32 +03:00
parent 9bf057b06e
commit 90477ae87d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -299,6 +299,10 @@
# HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default.
#
# [*heat_clients_url*]
# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*verbose*]
@ -375,6 +379,7 @@ class heat(
$max_json_body_size = $::os_service_default,
$notification_driver = $::os_service_default,
$enable_proxy_headers_parsing = $::os_service_default,
$heat_clients_url = $::os_service_default,
# Deprecated
$verbose = undef,
) {
@ -475,6 +480,7 @@ class heat(
'trustee/user_domain_id': value => $keystone_user_domain_id;
'clients_keystone/auth_uri': value => $identity_uri;
'clients_heat/url': value => $heat_clients_url;
}
if (!is_service_default($enable_stack_adopt)) {

5
spec/classes/heat_init_spec.rb
View File

@ -18,6 +18,7 @@ describe 'heat' do
:keystone_ec2_uri => 'http://127.0.0.1:5000/v2.0/ec2tokens',
:flavor => 'keystone',
:keystone_password => 'secretpassword',
:heat_clients_url => '<SERVICE DEFAULT>',
}
end
@ -132,6 +133,10 @@ describe 'heat' do
is_expected.to contain_heat_config('oslo_middleware/enable_proxy_headers_parsing').with_value('<SERVICE DEFAULT>')
end
it 'sets clients_heat url' do
is_expected.to contain_heat_config('clients_heat/url').with_value('<SERVICE DEFAULT>')
end
it_configures "with default auth method"
end