Merge "Wallaby and older: Use 'UNSET' to remove heat dashboard parameters" into stable/train
This commit is contained in:
commit
6cf72b168b
|
@ -48,11 +48,13 @@ class horizon::dashboards::heat(
|
||||||
$policy_file_real = $policy_file
|
$policy_file_real = $policy_file
|
||||||
}
|
}
|
||||||
|
|
||||||
if $::horizon::enable_user_pass != undef {
|
if $::horizon::enable_user_pass == undef or $::horizon::enable_user_pass == 'UNSET' {
|
||||||
|
$enable_user_pass_real = $enable_user_pass
|
||||||
|
} else {
|
||||||
warning('The horizon::dashboards::heat::enable_user_pass parameter is ignored \
|
warning('The horizon::dashboards::heat::enable_user_pass parameter is ignored \
|
||||||
because horizon::enable_user_pass parameter is set.')
|
because horizon::enable_user_pass parameter is set.')
|
||||||
|
$enable_user_pass_real = $enable_user_pass
|
||||||
}
|
}
|
||||||
$enable_user_pass_real = pick($::horizon::enable_user_pass, $enable_user_pass)
|
|
||||||
|
|
||||||
$config_file = "${::horizon::params::conf_d_dir}/_1699_orchestration_settings.py"
|
$config_file = "${::horizon::params::conf_d_dir}/_1699_orchestration_settings.py"
|
||||||
|
|
||||||
|
|
|
@ -445,7 +445,8 @@
|
||||||
#
|
#
|
||||||
# [*enable_user_pass*]
|
# [*enable_user_pass*]
|
||||||
# (optional) Enable the password field while launching a Heat stack.
|
# (optional) Enable the password field while launching a Heat stack.
|
||||||
# Set this parameter to undef if horizon::dashboards::heat is used.
|
# Set this parameter to undef or 'UNSET' if horizon::dashboards::heat is
|
||||||
|
# used.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
#
|
#
|
||||||
# [*customization_module*]
|
# [*customization_module*]
|
||||||
|
|
|
@ -489,7 +489,7 @@ OPENSTACK_NEUTRON_NETWORK = {
|
||||||
}
|
}
|
||||||
<%-end-%>
|
<%-end-%>
|
||||||
|
|
||||||
<%- if ! (@enable_user_pass.nil?) -%>
|
<%- if ! (@enable_user_pass.nil? or @enable_user_pass == 'UNSET') -%>
|
||||||
# The OPENSTACK_HEAT_STACK settings can be used to disable password
|
# The OPENSTACK_HEAT_STACK settings can be used to disable password
|
||||||
# field required while launching the stack.
|
# field required while launching the stack.
|
||||||
#OPENSTACK_HEAT_STACK = {
|
#OPENSTACK_HEAT_STACK = {
|
||||||
|
|
Loading…
Reference in New Issue