Merge "heat: align config with instack-undercloud"
This commit is contained in:
commit
caf074731e
|
@ -34,10 +34,11 @@ parameter_defaults:
|
||||||
# Ironic to be disabled in the case of multiple deployment failures.
|
# Ironic to be disabled in the case of multiple deployment failures.
|
||||||
NovaAutoDisabling: '0'
|
NovaAutoDisabling: '0'
|
||||||
NeutronDhcpAgentsPerNetwork: 2
|
NeutronDhcpAgentsPerNetwork: 2
|
||||||
HeatConvergenceEngine: false
|
HeatConvergenceEngine: true
|
||||||
HeatCorsAllowedOrigin: '*'
|
HeatCorsAllowedOrigin: '*'
|
||||||
HeatMaxResourcesPerStack: -1
|
HeatMaxResourcesPerStack: -1
|
||||||
HeatMaxJsonBodySize: 2097152
|
HeatMaxJsonBodySize: 4194304
|
||||||
|
HeatReauthenticationAuthMethod: 'trusts'
|
||||||
IronicCleaningDiskErase: 'metadata'
|
IronicCleaningDiskErase: 'metadata'
|
||||||
IronicCorsAllowedOrigin: '*'
|
IronicCorsAllowedOrigin: '*'
|
||||||
IronicDefaultInspectInterface: 'inspector'
|
IronicDefaultInspectInterface: 'inspector'
|
||||||
|
|
|
@ -39,6 +39,17 @@ parameters:
|
||||||
default: 0
|
default: 0
|
||||||
description: Number of workers for Heat service.
|
description: Number of workers for Heat service.
|
||||||
type: number
|
type: number
|
||||||
|
HeatMaxNestedStackDepth:
|
||||||
|
default: 6
|
||||||
|
description: Maximum number of nested stack depth.
|
||||||
|
type: number
|
||||||
|
HeatReauthenticationAuthMethod:
|
||||||
|
description: Allow reauthentication on token expiry, such that long-running tasks
|
||||||
|
may complete. Note this defeats the expiry of any provided user tokens.
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
constraints:
|
||||||
|
- allowed_values: [ '', 'trusts' ]
|
||||||
HeatPassword:
|
HeatPassword:
|
||||||
description: The password for the Heat service and db account, used by the Heat services.
|
description: The password for the Heat service and db account, used by the Heat services.
|
||||||
type: string
|
type: string
|
||||||
|
@ -98,8 +109,9 @@ outputs:
|
||||||
- get_attr: [HeatBase, role_data, config_settings]
|
- get_attr: [HeatBase, role_data, config_settings]
|
||||||
- heat::engine::configure_delegated_roles: false
|
- heat::engine::configure_delegated_roles: false
|
||||||
heat::engine::trusts_delegated_roles: []
|
heat::engine::trusts_delegated_roles: []
|
||||||
heat::engine::max_nested_stack_depth: 6
|
heat::engine::max_nested_stack_depth: {get_param: HeatMaxNestedStackDepth}
|
||||||
heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack}
|
heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack}
|
||||||
|
heat::engine::reauthentication_auth_method: {get_param: HeatReauthenticationAuthMethod}
|
||||||
heat::engine::heat_metadata_server_url:
|
heat::engine::heat_metadata_server_url:
|
||||||
make_url:
|
make_url:
|
||||||
scheme: {get_param: [EndpointMap, HeatCfnPublic, protocol]}
|
scheme: {get_param: [EndpointMap, HeatCfnPublic, protocol]}
|
||||||
|
|
Loading…
Reference in New Issue