openstack/puppet-heat
Code Issues Proposed changes

Set trusts_delegated_roles to os_service_default in engine.pp

Browse Source 
change trusts_delegated_roles to $::os_service_default,
modified heat_engine_spec.rb and added releasenote.

Change-Id: Ib07a546da74218056bb55f15df1b6114e9f67c45
Closes-Bug: #1634361
This commit is contained in:
zhangdetong 2016-11-22 14:04:11 +08:00
parent b865dffaa6
commit 739a15ffb2
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/engine.pp
View File

@ -75,7 +75,7 @@
# (optional) Array of trustor roles to be delegated to heat.
# This value is also used by heat::keystone::auth if it is set to
# configure the keystone roles.
# Defaults to ['heat_stack_owner']
# Defaults to $::os_service_default.
#
# [*instance_connection_is_secure*]
# (Optional) Instance connection to CFN/CW API via https.
@ -122,7 +122,7 @@ class heat::engine (
$deferred_auth_method = $::os_service_default,
$default_software_config_transport = $::os_service_default,
$default_deployment_signal_transport = $::os_service_default,
$trusts_delegated_roles = ['heat_stack_owner'],
$trusts_delegated_roles = $::os_service_default,
$instance_connection_is_secure = $::os_service_default,
$instance_connection_https_validate_certificates = $::os_service_default,
$max_resources_per_stack = $::os_service_default,

4
releasenotes/notes/fix_trusts_delegated_roles-708642a94898d65a.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Change trusts_delegated_roles to os_service_default, it has
changed to [] since Kilo.

2
spec/classes/heat_engine_spec.rb
View File

@ -10,7 +10,7 @@ describe 'heat::engine' do
:heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition',
:heat_watch_server_url => 'http://128.0.0.1:8003',
:engine_life_check_timeout => '<SERVICE DEFAULT>',
:trusts_delegated_roles => ['heat_stack_owner'],
:trusts_delegated_roles => '<SERVICE DEFAULT>',
:deferred_auth_method => '<SERVICE DEFAULT>',
:default_software_config_transport => '<SERVICE DEFAULT>',
:default_deployment_signal_transport => '<SERVICE DEFAULT>',